Repository: ignite Updated Branches: refs/heads/ignite-843-rc3 a9dbe6858 -> 9fb28f428
IGNITE-843 Minor fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b238236 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b238236 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b238236 Branch: refs/heads/ignite-843-rc3 Commit: 4b23823680e293e23d0032320fadc2d1c6c3a5e0 Parents: a9dbe68 Author: Andrey <[email protected]> Authored: Thu Feb 4 10:04:01 2016 +0700 Committer: Andrey <[email protected]> Committed: Thu Feb 4 10:04:01 2016 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/app/index.js | 4 ++-- .../main/js/app/providers/Countries/index.js | 25 -------------------- .../src/main/js/app/services/Countries/index.js | 23 ++++++++++++++++++ .../src/main/js/controllers/common-module.js | 2 +- 4 files changed, 26 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b238236/modules/control-center-web/src/main/js/app/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js index 2e25044..e6a2c65 100644 --- a/modules/control-center-web/src/main/js/app/index.js +++ b/modules/control-center-web/src/main/js/app/index.js @@ -94,9 +94,9 @@ import igniteFormFieldJavaClass from './directives/form-field-java-class/form-fi // Services. import cleanup from './services/cleanup/cleanup.service'; import IgniteUiAceOnLoad from './services/UiAceOnLoad/service'; +import IgniteCountries from './services/Countries/index'; // Providers -import igniteCountries from './providers/Countries/index'; // Filters. import hasPojo from './filters/hasPojo/hasPojo.filter'; @@ -142,8 +142,8 @@ angular // Services. .service(...cleanup) .service(...IgniteUiAceOnLoad) +.service(...IgniteCountries) // Providers. -.provider(...igniteCountries) // Filters. .filter(...hasPojo) .config(['$stateProvider', '$locationProvider', '$urlRouterProvider', function($stateProvider, $locationProvider, $urlRouterProvider) { http://git-wip-us.apache.org/repos/asf/ignite/blob/4b238236/modules/control-center-web/src/main/js/app/providers/Countries/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/providers/Countries/index.js b/modules/control-center-web/src/main/js/app/providers/Countries/index.js deleted file mode 100644 index 748e4ff..0000000 --- a/modules/control-center-web/src/main/js/app/providers/Countries/index.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// Java built-in short class names. -import COUNTRIES from 'app/data/countries.json!'; - -export default ['igniteCountries', function() { - this.$get = [() => { - return COUNTRIES; - }]; -}]; http://git-wip-us.apache.org/repos/asf/ignite/blob/4b238236/modules/control-center-web/src/main/js/app/services/Countries/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/services/Countries/index.js b/modules/control-center-web/src/main/js/app/services/Countries/index.js new file mode 100644 index 0000000..82b8626 --- /dev/null +++ b/modules/control-center-web/src/main/js/app/services/Countries/index.js @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Java built-in short class names. +import COUNTRIES from 'app/data/countries.json!'; + +export default ['IgniteCountries', function() { + return COUNTRIES; +}]; http://git-wip-us.apache.org/repos/asf/ignite/blob/4b238236/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 0e37898..7c663ec 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -2041,7 +2041,7 @@ consoleModule.controller('resetPassword', [ // Login popup controller. // TODO IGNITE-1936 Refactor this controller. -consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'igniteCountries', function ($scope, $focus, Auth, countries) { +consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries', function ($scope, $focus, Auth, countries) { $scope.auth = Auth.auth; $scope.action = 'login';
