Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 07013200B46 for ; Fri, 1 Jul 2016 09:17:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0591E160A61; Fri, 1 Jul 2016 07:17:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 40132160A6C for ; Fri, 1 Jul 2016 09:17:50 +0200 (CEST) Received: (qmail 36601 invoked by uid 500); 1 Jul 2016 07:17:49 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 36285 invoked by uid 99); 1 Jul 2016 07:17:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2016 07:17:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E11DEED230; Fri, 1 Jul 2016 07:17:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Fri, 01 Jul 2016 07:17:50 -0000 Message-Id: <569c2d5d382e4b2da20273fc8320b851@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/51] [abbrv] ignite git commit: IGNITE-3319 Migrated frontend build to webpack. archived-at: Fri, 01 Jul 2016 07:17:54 -0000 IGNITE-3319 Migrated frontend build to webpack. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5baae1ec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5baae1ec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5baae1ec Branch: refs/heads/ignite-3262 Commit: 5baae1eccc4705b04857cf8e1d494b30b55f09e3 Parents: bbc3d2a Author: Maxim Afanasiev Authored: Mon Jun 27 14:58:56 2016 +0700 Committer: Andrey Novikov Committed: Mon Jun 27 14:58:56 2016 +0700 ---------------------------------------------------------------------- modules/web-console/src/main/js/.gitignore | 2 - modules/web-console/src/main/js/app/app.js | 207 +++++++++ .../directives/centered/centered.directive.js | 2 +- .../information/information.directive.js | 4 +- .../ui-ace-docker/ui-ace-docker.directive.js | 4 +- .../ui-ace-java/ui-ace-java.directive.js | 4 +- .../ui-ace-pojos/ui-ace-pojos.directive.js | 4 +- .../ui-ace-pom/ui-ace-pom.directive.js | 4 +- .../ui-ace-xml/ui-ace-xml.directive.js | 4 +- modules/web-console/src/main/js/app/index.js | 241 ----------- .../src/main/js/app/modules/Demo/Demo.module.js | 2 +- .../src/main/js/app/modules/ace.module.js | 4 +- .../modules/branding/header-logo.directive.js | 4 +- .../branding/powered-by-apache.directive.js | 4 +- .../configuration/EventGroups.provider.js | 2 +- .../configuration/generator/Pom.service.js | 2 +- .../js/app/modules/dialog/dialog.factory.js | 4 +- .../modules/form/field/dropdown.directive.js | 4 +- .../main/js/app/modules/form/field/field.css | 2 +- .../app/modules/form/field/field.directive.js | 6 +- .../form/field/input/checkbox.directive.js | 4 +- .../form/field/input/datalist.directive.js | 4 +- .../form/field/input/number.directive.js | 4 +- .../modules/form/field/input/text.directive.js | 6 +- .../app/modules/form/group/group.directive.js | 4 +- .../app/modules/form/group/table.directive.js | 4 +- .../getting-started/GettingStarted.provider.js | 2 +- .../js/app/modules/loading/loading.directive.js | 8 +- .../caches/concurrency.directive.js | 4 +- .../configuration/caches/general.directive.js | 4 +- .../configuration/caches/memory.directive.js | 4 +- .../configuration/caches/query.directive.js | 4 +- .../configuration/caches/rebalance.directive.js | 4 +- .../caches/server-near-cache.directive.js | 4 +- .../caches/statistics.directive.js | 4 +- .../configuration/caches/store.directive.js | 4 +- .../configuration/clusters/atomic.directive.js | 4 +- .../clusters/attributes.directive.js | 4 +- .../configuration/clusters/binary.directive.js | 4 +- .../clusters/collision.directive.js | 4 +- .../clusters/collision/custom.directive.js | 4 +- .../clusters/collision/fifo-queue.directive.js | 4 +- .../collision/job-stealing.directive.js | 4 +- .../collision/priority-queue.directive.js | 4 +- .../clusters/communication.directive.js | 4 +- .../clusters/connector.directive.js | 4 +- .../clusters/deployment.directive.js | 4 +- .../clusters/discovery.directive.js | 4 +- .../configuration/clusters/events.directive.js | 4 +- .../clusters/failover.directive.js | 4 +- .../configuration/clusters/general.directive.js | 4 +- .../general/discovery/cloud.directive.js | 4 +- .../general/discovery/google.directive.js | 4 +- .../general/discovery/jdbc.directive.js | 4 +- .../general/discovery/multicast.directive.js | 4 +- .../clusters/general/discovery/s3.directive.js | 4 +- .../general/discovery/shared.directive.js | 4 +- .../clusters/general/discovery/vm.directive.js | 4 +- .../clusters/general/discovery/vm.jade | 2 +- .../general/discovery/zookeeper.directive.js | 4 +- .../bounded-exponential-backoff.directive.js | 4 +- .../zookeeper/retrypolicy/custom.directive.js | 4 +- .../exponential-backoff.directive.js | 4 +- .../zookeeper/retrypolicy/forever.directive.js | 4 +- .../zookeeper/retrypolicy/n-times.directive.js | 4 +- .../zookeeper/retrypolicy/one-time.directive.js | 4 +- .../retrypolicy/until-elapsed.directive.js | 4 +- .../configuration/clusters/igfs.directive.js | 4 +- .../configuration/clusters/logger.directive.js | 4 +- .../clusters/logger/custom.directive.js | 4 +- .../clusters/logger/log4j.directive.js | 4 +- .../clusters/logger/log4j2.directive.js | 4 +- .../clusters/marshaller.directive.js | 4 +- .../configuration/clusters/metrics.directive.js | 4 +- .../configuration/clusters/ssl.directive.js | 4 +- .../configuration/clusters/swap.directive.js | 4 +- .../configuration/clusters/thread.directive.js | 4 +- .../configuration/clusters/time.directive.js | 4 +- .../clusters/transactions.directive.js | 4 +- .../configuration/domains/general.directive.js | 4 +- .../configuration/domains/query.directive.js | 4 +- .../configuration/domains/store.directive.js | 4 +- .../states/configuration/igfs/dual.directive.js | 4 +- .../igfs/fragmentizer.directive.js | 4 +- .../configuration/igfs/general.directive.js | 4 +- .../states/configuration/igfs/ipc.directive.js | 4 +- .../states/configuration/igfs/misc.directive.js | 4 +- .../configuration/igfs/secondary.directive.js | 4 +- .../configuration/preview-panel.directive.js | 4 +- .../main/js/app/modules/states/signin.state.js | 3 +- .../main/js/app/services/ChartColors.service.js | 2 +- .../main/js/app/services/Countries.service.js | 2 +- .../main/js/app/services/JavaTypes.service.js | 6 +- modules/web-console/src/main/js/app/vendor.js | 50 +++ .../src/main/js/build/system.config.js | 424 ------------------- .../src/main/js/controllers/common-module.js | 4 +- .../src/main/js/gulpfile.babel.js/paths.js | 65 ++- .../main/js/gulpfile.babel.js/tasks/build.js | 2 +- .../main/js/gulpfile.babel.js/tasks/bundle.js | 68 +-- .../main/js/gulpfile.babel.js/tasks/clean.js | 5 +- .../main/js/gulpfile.babel.js/tasks/connect.js | 47 -- .../src/main/js/gulpfile.babel.js/tasks/copy.js | 27 +- .../main/js/gulpfile.babel.js/tasks/eslint.js | 46 -- .../gulpfile.babel.js/tasks/ignite-modules.js | 9 +- .../src/main/js/gulpfile.babel.js/tasks/sass.js | 25 -- .../main/js/gulpfile.babel.js/tasks/watch.js | 16 +- .../main/js/gulpfile.babel.js/webpack/common.js | 179 ++++++++ .../webpack/environments/development.js | 64 +++ .../webpack/environments/production.js | 45 ++ .../main/js/gulpfile.babel.js/webpack/index.js | 32 ++ .../webpack/plugins/progress.js | 76 ++++ modules/web-console/src/main/js/package.json | 300 ++++--------- .../stylesheets/_font-awesome-custom.scss | 27 +- .../src/main/js/public/stylesheets/style.scss | 9 +- .../web-console/src/main/js/views/index.jade | 17 - 115 files changed, 982 insertions(+), 1356 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/.gitignore ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/.gitignore b/modules/web-console/src/main/js/.gitignore index c966a99..a6af5e1 100644 --- a/modules/web-console/src/main/js/.gitignore +++ b/modules/web-console/src/main/js/.gitignore @@ -2,10 +2,8 @@ *.log .npmrc build/* -!build/system.config.js node_modules ignite_modules_temp/* public/stylesheets/*.css serve/config/*.json serve/agent_dists/*.zip - http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/app.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/app.js b/modules/web-console/src/main/js/app/app.js new file mode 100644 index 0000000..a33e385 --- /dev/null +++ b/modules/web-console/src/main/js/app/app.js @@ -0,0 +1,207 @@ +/* + * 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. + */ + +import '../public/stylesheets/style.scss'; + +import './decorator/select'; +import './decorator/tooltip'; + +import './services/JavaTypes.service.js'; +import './modules/form/form.module'; +import './modules/agent/agent.module.js'; +import './modules/query-notebooks/query-notebooks.module'; +import './modules/Demo/Demo.module.js'; + +import './modules/states/signin.state'; +import './modules/states/logout.state'; +import './modules/states/password.state'; +import './modules/states/configuration.state'; +import './modules/states/sql.state'; +import './modules/states/profile.state'; +import './modules/states/admin.state'; + +// ignite:modules +import './modules/user/user.module'; +import './modules/branding/branding.module'; +import './modules/navbar/navbar.module'; +import './modules/configuration/configuration.module'; +import './modules/getting-started/GettingStarted.provider'; +import './modules/dialog/dialog.module'; +import './modules/Version/Version.provider'; +import './modules/ace.module'; +import './modules/socket.module'; +import './modules/loading/loading.module'; +// endignite + +// Directives. +import igniteHideOnStateChange from './directives/hide-on-state-change/hide-on-state-change.directive'; +import igniteInformation from './directives/information/information.directive'; +import igniteUiAceTabs from './directives/ui-ace-tabs.directive'; +import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive'; +import igniteUiAceJava from './directives/ui-ace-java/ui-ace-java.directive'; +import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive'; +import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directive'; +import igniteUiAcePojos from './directives/ui-ace-pojos/ui-ace-pojos.directive'; +import igniteBsAffixUpdate from './directives/bs-affix-update.directive'; +import igniteCentered from './directives/centered/centered.directive.js'; + +// Services. +import cleanup from './services/cleanup.service'; +import confirm from './services/confirm.service'; +import IgniteInetAddress from './services/InetAddress.service'; +import IgniteCountries from './services/Countries.service'; +import IgniteChartColors from './services/ChartColors.service'; +import JavaTypes from './services/JavaTypes.service'; + +// Providers. + +// Filters. +import hasPojo from './filters/hasPojo.filter'; +import byName from './filters/byName.filter'; + +// Generators +import $generatorCommon from 'generator/generator-common'; +import $generatorJava from 'generator/generator-java'; +import $generatorOptional from 'generator/generator-optional'; +import $generatorProperties from 'generator/generator-properties'; +import $generatorReadme from 'generator/generator-readme'; +import $generatorXml from 'generator/generator-xml'; + +window.$generatorCommon = $generatorCommon; +window.$generatorJava = $generatorJava; +window.$generatorOptional = $generatorOptional; +window.$generatorProperties = $generatorProperties; +window.$generatorReadme = $generatorReadme; +window.$generatorXml = $generatorXml; + +// Add legacy logic; +import consoleModule from 'controllers/common-module'; +window.consoleModule = consoleModule; + +import 'controllers/admin-controller'; +import 'controllers/caches-controller'; +import 'controllers/clusters-controller'; +import 'controllers/domains-controller'; +import 'controllers/igfs-controller'; +import 'controllers/profile-controller'; +import 'controllers/sql-controller'; + +// Inject external modules. +import 'ignite_modules_temp/index'; + +import baseTemplate from '../views/base.jade'; + +angular +.module('ignite-console', [ + 'ngRetina', + 'btford.socket-io', + 'ngAnimate', + 'ngSanitize', + 'mgcrea.ngStrap', + 'ui.router', + 'gridster', + // Base modules. + 'ignite-console.ace', + 'ignite-console.Form', + 'ignite-console.user', + 'ignite-console.branding', + 'ignite-console.socket', + 'ignite-console.agent', + 'ignite-console.query-notebooks', + 'ignite-console.demo', + // States. + 'ignite-console.states.login', + 'ignite-console.states.logout', + 'ignite-console.states.password', + 'ignite-console.states.configuration', + 'ignite-console.states.sql', + 'ignite-console.states.profile', + 'ignite-console.states.admin', + // Common modules. + 'ignite-console.dialog', + 'ignite-console.navbar', + 'ignite-console.configuration', + 'ignite-console.getting-started', + 'ignite-console.version', + 'ignite-console.loading', + // Ignite legacy module. + 'ignite-console.legacy', + // Ignite modules. + 'ignite-console.modules' +]) +// Directives. +.directive(...igniteHideOnStateChange) +.directive(...igniteInformation) +.directive(...igniteUiAceTabs) +.directive(...igniteUiAceXml) +.directive(...igniteUiAceJava) +.directive(...igniteUiAcePom) +.directive(...igniteUiAceDocker) +.directive(...igniteUiAcePojos) +.directive(...igniteBsAffixUpdate) +.directive(...igniteCentered) +// Services. +.service(...cleanup) +.service(...confirm) +.service(...IgniteInetAddress) +.service(...IgniteCountries) +.service(...IgniteChartColors) +.service(...JavaTypes) +// Providers. +// Filters. +.filter(...hasPojo) +.filter(...byName) +.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', ($stateProvider, $locationProvider, $urlRouterProvider) => { + // Set up the states. + $stateProvider + .state('base', { + url: '', + abstract: true, + templateUrl: baseTemplate + }) + .state('settings', { + url: '/settings', + abstract: true, + templateUrl: baseTemplate + }); + + $urlRouterProvider.otherwise('/'); + + $locationProvider.html5Mode(true); +}]) +.config(['$animateProvider', ($animateProvider) => { + $animateProvider.classNameFilter(/^((?!(fa-spin)).)*$/); +}]) +.run(['$rootScope', ($root) => { + $root._ = _; +}]) +.run(['$rootScope', '$state', 'MetaTags', 'Auth', 'User', 'IgniteAgentMonitor', ($root, $state, $meta, Auth, User, agentMonitor) => { + $root.$state = $state; + + $root.$meta = $meta; + + if (Auth.authorized) { + User.read() + .then((user) => $root.$broadcast('user', user)) + .then(() => Auth.authorized && agentMonitor.init()); + } +}]) +.run(['$rootScope', ($root) => { + $root.$on('$stateChangeStart', () => { + _.forEach(angular.element('.modal'), (m) => angular.element(m).scope().$hide()); + }); +}]); http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/centered/centered.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/centered/centered.directive.js b/modules/web-console/src/main/js/app/directives/centered/centered.directive.js index 719194c..4abd086 100644 --- a/modules/web-console/src/main/js/app/directives/centered/centered.directive.js +++ b/modules/web-console/src/main/js/app/directives/centered/centered.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import './centered.css!'; +import './centered.css'; export default ['centered', [() => { return { http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/information/information.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/information/information.directive.js b/modules/web-console/src/main/js/app/directives/information/information.directive.js index 9250639..a9a2f8c 100644 --- a/modules/web-console/src/main/js/app/directives/information/information.directive.js +++ b/modules/web-console/src/main/js/app/directives/information/information.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './information.jade!'; +import templateUrl from './information.jade'; export default ['igniteInformation', [() => { return { @@ -23,7 +23,7 @@ export default ['igniteInformation', [() => { title: '@' }, restrict: 'E', - template, + templateUrl, replace: true, transclude: true }; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js index 47a52df..08e4f76 100644 --- a/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js +++ b/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './ui-ace-docker.jade!'; +import templateUrl from './ui-ace-docker.jade'; import controller from './ui-ace-docker.controller'; export default ['igniteUiAceDocker', [() => { @@ -38,7 +38,7 @@ export default ['igniteUiAceDocker', [() => { data: '=ngModel' }, link, - template, + templateUrl, controller, controllerAs: 'ctrl', require: ['?^igniteUiAceTabs'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js index cdce0fc..17d3a00 100644 --- a/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js +++ b/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './ui-ace-java.jade!'; +import templateUrl from './ui-ace-java.jade'; import controller from './ui-ace-java.controller'; export default ['igniteUiAceJava', ['GeneratorJava', (generator) => { @@ -125,7 +125,7 @@ export default ['igniteUiAceJava', ['GeneratorJava', (generator) => { data: '=?ngModel' }, link, - template, + templateUrl, controller, controllerAs: 'ctrl', require: ['igniteUiAceJava', '?^igniteUiAceTabs', '?^form', '?ngModel'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js index 6222dc0..7c224b7 100644 --- a/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js +++ b/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './ui-ace-pojos.jade!'; +import templateUrl from './ui-ace-pojos.jade'; import controller from './ui-ace-pojos.controller'; export default ['igniteUiAcePojos', [() => { @@ -38,7 +38,7 @@ export default ['igniteUiAcePojos', [() => { pojos: '=ngModel' }, link, - template, + templateUrl, controller, controllerAs: 'ctrl', require: ['?^igniteUiAceTabs'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js index 3d68ba9..2a7a878 100644 --- a/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js +++ b/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './ui-ace-pom.jade!'; +import templateUrl from './ui-ace-pom.jade'; import controller from './ui-ace-pom.controller'; export default ['igniteUiAcePom', [() => { @@ -33,7 +33,7 @@ export default ['igniteUiAcePom', [() => { cluster: '=' }, link, - template, + templateUrl, controller, controllerAs: 'ctrl', require: ['?^igniteUiAceTabs'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js index 1e913fb..3bae4de 100644 --- a/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js +++ b/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './ui-ace-xml.jade!'; +import templateUrl from './ui-ace-xml.jade'; import controller from './ui-ace-xml.controller'; export default ['igniteUiAceXml', ['GeneratorXml', (generator) => { @@ -125,7 +125,7 @@ export default ['igniteUiAceXml', ['GeneratorXml', (generator) => { data: '=?ngModel' }, link, - template, + templateUrl, controller, controllerAs: 'ctrl', require: ['igniteUiAceXml', '?^igniteUiAceTabs', '?^form', '?ngModel'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js deleted file mode 100644 index 397d25f..0000000 --- a/modules/web-console/src/main/js/app/index.js +++ /dev/null @@ -1,241 +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. - */ - -import _ from 'lodash'; -import ace from 'ace'; -import angular from 'angular'; -import pdfMake from 'pdfmake'; - -ace.config.set('basePath', '/jspm_packages/github/ajaxorg/ace-builds@1.2.3'); - -window._ = _; -window.require = ace.require; // TODO Should be removed after full refactoring to directives. -window.pdfMake = pdfMake; - -import 'angular-animate'; -import 'angular-sanitize'; -import 'angular-strap'; -import 'angular-socket-io'; -import 'angular-retina'; -import 'angular-ui-router'; -import 'angular-ui-router-metatags'; -import 'angular-smart-table'; -import 'angular-ui-grid'; -import 'angular-drag-and-drop-lists'; -import 'angular-nvd3'; -import 'angular-tree-control'; -import 'angular-gridster'; - -import 'bootstrap-carousel'; -import 'file-saver'; -import 'jszip'; -import 'query-command-supported'; - -import 'public/stylesheets/style.css!'; - -import 'angular-gridster/dist/angular-gridster.min.css!'; -import 'angular-tree-control/css/tree-control-attribute.css!'; -import 'angular-tree-control/css/tree-control.css!'; -import 'angular-ui-grid/ui-grid.css!'; -import 'angular-motion/dist/angular-motion.css!'; - -import './decorator/select'; -import './decorator/tooltip'; - -import './services/JavaTypes.service.js'; -import './modules/form/form.module'; -import './modules/agent/agent.module.js'; -import './modules/query-notebooks/query-notebooks.module'; -import './modules/Demo/Demo.module.js'; - -import './modules/states/signin.state'; -import './modules/states/logout.state'; -import './modules/states/password.state'; -import './modules/states/configuration.state'; -import './modules/states/sql.state'; -import './modules/states/profile.state'; -import './modules/states/admin.state'; - -// ignite:modules -import './modules/user/user.module'; -import './modules/branding/branding.module'; -import './modules/navbar/navbar.module'; -import './modules/configuration/configuration.module'; -import './modules/getting-started/GettingStarted.provider'; -import './modules/dialog/dialog.module'; -import './modules/Version/Version.provider'; -import './modules/ace.module'; -import './modules/socket.module'; -import './modules/loading/loading.module'; -// endignite - -// Directives. -import igniteHideOnStateChange from './directives/hide-on-state-change/hide-on-state-change.directive'; -import igniteInformation from './directives/information/information.directive'; -import igniteUiAceTabs from './directives/ui-ace-tabs.directive'; -import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive'; -import igniteUiAceJava from './directives/ui-ace-java/ui-ace-java.directive'; -import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive'; -import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directive'; -import igniteUiAcePojos from './directives/ui-ace-pojos/ui-ace-pojos.directive'; -import igniteBsAffixUpdate from './directives/bs-affix-update.directive'; -import igniteСentered from './directives/centered/centered.directive.js'; - -// Services. -import cleanup from './services/cleanup.service'; -import confirm from './services/confirm.service'; -import IgniteInetAddress from './services/InetAddress.service'; -import IgniteCountries from './services/Countries.service'; -import IgniteChartColors from './services/ChartColors.service'; -import JavaTypes from './services/JavaTypes.service'; - -// Providers. - -// Filters. -import hasPojo from './filters/hasPojo.filter'; -import byName from './filters/byName.filter'; - -// Generators -import $generatorCommon from 'generator/generator-common'; -import $generatorJava from 'generator/generator-java'; -import $generatorOptional from 'generator/generator-optional'; -import $generatorProperties from 'generator/generator-properties'; -import $generatorReadme from 'generator/generator-readme'; -import $generatorXml from 'generator/generator-xml'; - -window.$generatorCommon = $generatorCommon; -window.$generatorJava = $generatorJava; -window.$generatorOptional = $generatorOptional; -window.$generatorProperties = $generatorProperties; -window.$generatorReadme = $generatorReadme; -window.$generatorXml = $generatorXml; - -// Add legacy logic; -import consoleModule from 'controllers/common-module'; -window.consoleModule = consoleModule; - -import 'controllers/admin-controller'; -import 'controllers/caches-controller'; -import 'controllers/clusters-controller'; -import 'controllers/domains-controller'; -import 'controllers/igfs-controller'; -import 'controllers/profile-controller'; -import 'controllers/sql-controller'; - -// Inject external modules. -import 'ignite_modules_temp/index'; - -angular -.module('ignite-console', [ - 'ngRetina', - 'btford.socket-io', - 'ngAnimate', - 'ngSanitize', - 'mgcrea.ngStrap', - 'ui.router', - 'gridster', - // Base modules. - 'ignite-console.ace', - 'ignite-console.Form', - 'ignite-console.user', - 'ignite-console.branding', - 'ignite-console.socket', - 'ignite-console.agent', - 'ignite-console.query-notebooks', - 'ignite-console.demo', - // States. - 'ignite-console.states.login', - 'ignite-console.states.logout', - 'ignite-console.states.password', - 'ignite-console.states.configuration', - 'ignite-console.states.sql', - 'ignite-console.states.profile', - 'ignite-console.states.admin', - // Common modules. - 'ignite-console.dialog', - 'ignite-console.navbar', - 'ignite-console.configuration', - 'ignite-console.getting-started', - 'ignite-console.version', - 'ignite-console.loading', - // Ignite legacy module. - 'ignite-console.legacy', - // Ignite modules. - 'ignite-console.modules' -]) -// Directives. -.directive(...igniteHideOnStateChange) -.directive(...igniteInformation) -.directive(...igniteUiAceTabs) -.directive(...igniteUiAceXml) -.directive(...igniteUiAceJava) -.directive(...igniteUiAcePom) -.directive(...igniteUiAceDocker) -.directive(...igniteUiAcePojos) -.directive(...igniteBsAffixUpdate) -.directive(...igniteСentered) -// Services. -.service(...cleanup) -.service(...confirm) -.service(...IgniteInetAddress) -.service(...IgniteCountries) -.service(...IgniteChartColors) -.service(...JavaTypes) -// Providers. -// Filters. -.filter(...hasPojo) -.filter(...byName) -.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', ($stateProvider, $locationProvider, $urlRouterProvider) => { - // Set up the states. - $stateProvider - .state('base', { - url: '', - abstract: true, - templateUrl: '/base.html' - }) - .state('settings', { - url: '/settings', - abstract: true, - templateUrl: '/base.html' - }); - - $urlRouterProvider.otherwise('/'); - - $locationProvider.html5Mode(true); -}]) -.config(['$animateProvider', ($animateProvider) => { - $animateProvider.classNameFilter(/^((?!(fa-spin)).)*$/); -}]) -.run(['$rootScope', ($root) => { - $root._ = _; -}]) -.run(['$rootScope', '$state', 'MetaTags', 'Auth', 'User', 'IgniteAgentMonitor', ($root, $state, $meta, Auth, User, agentMonitor) => { - $root.$state = $state; - - $root.$meta = $meta; - - if (Auth.authorized) { - User.read() - .then((user) => $root.$broadcast('user', user)) - .then(() => Auth.authorized && agentMonitor.init()); - } -}]) -.run(['$rootScope', ($root) => { - $root.$on('$stateChangeStart', () => { - _.forEach(angular.element('.modal'), (m) => angular.element(m).scope().$hide()); - }); -}]); http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js b/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js index f08d84c..7680408 100644 --- a/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js +++ b/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js @@ -17,7 +17,7 @@ import angular from 'angular'; -import DEMO_INFO from 'app/data/demo-info.json!'; +import DEMO_INFO from 'app/data/demo-info.json'; angular .module('ignite-console.demo', [ http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/ace.module.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/ace.module.js b/modules/web-console/src/main/js/app/modules/ace.module.js index 2477965..4920a6f 100644 --- a/modules/web-console/src/main/js/app/modules/ace.module.js +++ b/modules/web-console/src/main/js/app/modules/ace.module.js @@ -44,13 +44,13 @@ angular const setOptions = (acee, session, opts) => { // Sets the ace worker path, if running from concatenated or minified source. if (angular.isDefined(opts.workerPath)) { - const config = window.ace.require('ace/config'); + const config = window.ace.acequire('ace/config'); config.set('workerPath', opts.workerPath); } // Ace requires loading. - _.forEach(opts.require, (n) => window.ace.require(n)); + _.forEach(opts.require, (n) => window.ace.acequire(n)); // Boolean options. if (angular.isDefined(opts.showGutter)) http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js b/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js index 1bfbc45..423de9c 100644 --- a/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js +++ b/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './header-logo.jade!'; +import templateUrl from './header-logo.jade'; export default ['igniteHeaderLogo', ['IgniteBranding', (branding) => { function controller() { @@ -26,7 +26,7 @@ export default ['igniteHeaderLogo', ['IgniteBranding', (branding) => { return { restrict: 'E', - template, + templateUrl, controller, controllerAs: 'logo', replace: true http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js b/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js index 37f1dec..2f02446 100644 --- a/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js +++ b/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import templatePoweredByApache from './powered-by-apache.jade!'; +import templateUrl from './powered-by-apache.jade'; export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => { function controller() { @@ -26,7 +26,7 @@ export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => { return { restrict: 'E', - template: templatePoweredByApache, + templateUrl, controller, controllerAs: 'poweredBy', replace: true http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js b/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js index 2bbf11f..61f3188 100644 --- a/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js +++ b/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js @@ -16,7 +16,7 @@ */ // Events groups. -import GROUPS from 'app/data/event-types.json!'; +import GROUPS from 'app/data/event-types.json'; export default ['igniteEventGroups', function() { const groups = GROUPS; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js b/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js index 3508e59..674c16e 100644 --- a/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js +++ b/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js @@ -16,7 +16,7 @@ */ // Java built-in class names. -import POM_DEPENDENCIES from 'app/data/pom-dependencies.json!'; +import POM_DEPENDENCIES from 'app/data/pom-dependencies.json'; /** * Pom file generation entry point. http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js b/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js index 18a2174..e15891f 100644 --- a/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js +++ b/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js @@ -15,11 +15,11 @@ * limitations under the License. */ -import template from './dialog.jade!'; +import templateUrl from './dialog.jade'; export default ['IgniteDialog', ['$modal', ($modal) => { const defaults = { - template: template(), + templateUrl, placement: 'center', show: false }; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js b/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js index fe4d948..a4c6abb 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './dropdown.jade!'; +import templateUrl from './dropdown.jade'; export default ['igniteFormFieldDropdown', ['IgniteFormGUID', '$table', (guid, $table) => { const controller = () => {}; @@ -74,7 +74,7 @@ export default ['igniteFormFieldDropdown', ['IgniteFormGUID', '$table', (guid, $ multiple: '=' }, link, - template, + templateUrl, controller, controllerAs: 'dropdown', replace: true, http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/field.css ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/field.css b/modules/web-console/src/main/js/app/modules/form/field/field.css index 8dfe05e..3ea64f4 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/field.css +++ b/modules/web-console/src/main/js/app/modules/form/field/field.css @@ -16,7 +16,7 @@ */ .indexField { - float: left; + float: left; line-height: 28px; margin-right: 5px; color: #ec1c24; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/field.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/field.directive.js b/modules/web-console/src/main/js/app/modules/form/field/field.directive.js index 0e3fe8d..630f74f 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/field.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/field.directive.js @@ -15,8 +15,8 @@ * limitations under the License. */ -import template from './field.jade!'; -import './field.css!'; +import templateUrl from './field.jade'; +import './field.css'; export default ['igniteFormField', [() => { const controller = [function() { @@ -34,7 +34,7 @@ export default ['igniteFormField', [() => { type: '@', name: '@' }, - template, + templateUrl, controller, controllerAs: 'field', replace: true, http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js index 5d77eab..d03b9ae 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './checkbox.jade!'; +import templateUrl from './checkbox.jade'; export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', '$table', (guid, $table) => { const link = (scope, el, attrs, [form, label]) => { @@ -59,7 +59,7 @@ export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', '$table', (gu value: '=ngModel' }, link, - template, + templateUrl, replace: true, transclude: true, require: ['^form', '?^igniteFormField'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js index ce67897..2fd8aa0 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './datalist.jade!'; +import templateUrl from './datalist.jade'; export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (guid, $table) => { const link = (scope, element, attrs, [ngModel, form, label], transclude) => { @@ -115,7 +115,7 @@ export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (gu autofocus: '=igniteFormFieldInputAutofocus' }, link, - template, + templateUrl, replace: true, transclude: true, require: ['ngModel', '^form', '?^igniteFormField'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js index 0c7a101..71f95b8 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './number.jade!'; +import templateUrl from './number.jade'; export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', '$table', (guid, $table) => { const link = (scope, el, attrs, [form, label]) => { @@ -69,7 +69,7 @@ export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', '$table', (guid value: '=ngModel' }, link, - template, + templateUrl, replace: true, transclude: true, require: ['^form', '?^igniteFormField'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js index adcc179..735578e 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js @@ -15,8 +15,8 @@ * limitations under the License. */ -import template from './text.jade!'; -import './text.css!'; +import templateUrl from './text.jade'; +import './text.css'; export default ['igniteFormFieldInputText', ['IgniteFormGUID', '$table', (guid, $table) => { const link = (scope, element, attrs, [ngModel, form, label], transclude) => { @@ -119,7 +119,7 @@ export default ['igniteFormFieldInputText', ['IgniteFormGUID', '$table', (guid, autofocus: '=igniteFormFieldInputAutofocus' }, link, - template, + templateUrl, replace: true, transclude: true, require: ['ngModel', '^form', '?^igniteFormField'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/group/group.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/group/group.directive.js b/modules/web-console/src/main/js/app/modules/form/group/group.directive.js index 0971d44..20cad22 100644 --- a/modules/web-console/src/main/js/app/modules/form/group/group.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/group/group.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import template from './group.jade!'; +import templateUrl from './group.jade'; export default ['igniteFormGroup', [() => { const controller = [function() { }]; @@ -71,7 +71,7 @@ export default ['igniteFormGroup', [() => { label: '@' }, link, - template, + templateUrl, controller, controllerAs: 'group', replace: true, http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/form/group/table.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/group/table.directive.js b/modules/web-console/src/main/js/app/modules/form/group/table.directive.js index 520f8c2..8c4d0ed 100644 --- a/modules/web-console/src/main/js/app/modules/form/group/table.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/group/table.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './table.jade!'; +import templateUrl from './table.jade'; export default ['igniteFormGroupTable', [() => { return { restrict: 'E', scope: {}, - template, + templateUrl, replace: true, transclude: true, require: ['^form', '^igniteFormGroup'] http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js b/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js index 74c24c2..cf9f561 100644 --- a/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js +++ b/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js @@ -18,7 +18,7 @@ import angular from 'angular'; // Getting started pages. -import PAGES from 'app/data/getting-started.json!'; +import PAGES from 'app/data/getting-started.json'; angular .module('ignite-console.getting-started', []) http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/loading/loading.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/loading/loading.directive.js b/modules/web-console/src/main/js/app/modules/loading/loading.directive.js index fc3e1e6..06e66b1 100644 --- a/modules/web-console/src/main/js/app/modules/loading/loading.directive.js +++ b/modules/web-console/src/main/js/app/modules/loading/loading.directive.js @@ -15,12 +15,12 @@ * limitations under the License. */ -import template from './loading.jade!'; -import './loading.css!'; +import templateUrl from './loading.jade'; +import './loading.css'; -export default ['igniteLoading', ['$loading', '$compile', ($loading, $compile) => { +export default ['igniteLoading', ['$loading', '$templateCache', '$compile', ($loading, $templateCache, $compile) => { const link = (scope, element) => { - const compiledTemplate = $compile(template()); + const compiledTemplate = $compile($templateCache.get(templateUrl)); const build = () => { scope.position = scope.position || 'middle'; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js index 0e00a4b..9438679 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './concurrency.jade!'; +import templateUrl from './concurrency.jade'; export default ['igniteConfigurationCachesConcurrency', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js index d3f5f45..3edc1a3 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './general.jade!'; +import templateUrl from './general.jade'; export default ['igniteConfigurationCachesGeneral', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js index 0f8662d..c160b18 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './memory.jade!'; +import templateUrl from './memory.jade'; export default ['igniteConfigurationCachesMemory', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js index b3b6edb..9d8264e 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './query.jade!'; +import templateUrl from './query.jade'; export default ['igniteConfigurationCachesQuery', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js index b3f24a1..5081578 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './rebalance.jade!'; +import templateUrl from './rebalance.jade'; export default ['igniteConfigurationCachesRebalance', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js index 5a4e474..c2e83aa 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './server-near-cache.jade!'; +import templateUrl from './server-near-cache.jade'; export default ['igniteConfigurationCachesServerNearCache', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js index d40ac1a..ee0da3d 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './statistics.jade!'; +import templateUrl from './statistics.jade'; export default ['igniteConfigurationCachesStatistics', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js index 168eb85..80528e5 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './store.jade!'; +import templateUrl from './store.jade'; export default ['igniteConfigurationCachesStore', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js index 062a527..64b80a0 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './atomic.jade!'; +import templateUrl from './atomic.jade'; export default ['igniteConfigurationClustersAtomic', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js index cc9d474..f5f431c 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './attributes.jade!'; +import templateUrl from './attributes.jade'; export default ['igniteConfigurationUserAttributes', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js index 68c8dcb..7d701bc 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './binary.jade!'; +import templateUrl from './binary.jade'; export default ['igniteConfigurationClustersBinary', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js index 624056e..b8e0b43 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './collision.jade!'; +import templateUrl from './collision.jade'; export default ['igniteConfigurationClustersCollision', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js index 9a8d414..2299133 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './custom.jade!'; +import templateUrl from './custom.jade'; export default ['igniteConfigurationClustersCollisionCustom', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js index 240c98a..f14c1bb 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './fifo-queue.jade!'; +import templateUrl from './fifo-queue.jade'; export default ['igniteConfigurationClustersCollisionFifoQueue', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js index 3c187d1..0cc9cfa 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './job-stealing.jade!'; +import templateUrl from './job-stealing.jade'; export default ['igniteConfigurationClustersCollisionJobStealing', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js index e7e8798..95ebd5e 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './priority-queue.jade!'; +import templateUrl from './priority-queue.jade'; export default ['igniteConfigurationClustersCollisionPriorityQueue', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js index 5203a9e..e578dc6 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './communication.jade!'; +import templateUrl from './communication.jade'; export default ['igniteConfigurationClustersCommunication', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js index 6c085b6..ea0b04d 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './connector.jade!'; +import templateUrl from './connector.jade'; export default ['igniteConfigurationClustersConnector', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js index bc71379..392ed7e 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './deployment.jade!'; +import templateUrl from './deployment.jade'; export default ['igniteConfigurationClustersDeployment', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js index f61d625..80286ac 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './discovery.jade!'; +import templateUrl from './discovery.jade'; export default ['igniteConfigurationClustersDiscovery', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js index c04829d..ee25ae2 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './events.jade!'; +import templateUrl from './events.jade'; export default ['igniteConfigurationClustersEvents', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js index 98335a7..b9f59ba 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './failover.jade!'; +import templateUrl from './failover.jade'; export default ['igniteConfigurationClustersFailover', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js index 29644fc..ccfadbe 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './general.jade!'; +import templateUrl from './general.jade'; export default ['igniteConfigurationClustersGeneral', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js index a785395..8fa7edc 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './cloud.jade!'; +import templateUrl from './cloud.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryCloud', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js index d7df6d2..a409946 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './google.jade!'; +import templateUrl from './google.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryGoogle', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js index 44d4624..6edd6ed 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './jdbc.jade!'; +import templateUrl from './jdbc.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryJdbc', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js index 606bb9d..67775d2 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './multicast.jade!'; +import templateUrl from './multicast.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryMulticast', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js index c0624f0..25fd90a 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './s3.jade!'; +import templateUrl from './s3.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryS3', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js index 6a5dce7..da1ee0c 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './shared.jade!'; +import templateUrl from './shared.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryShared', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js index 2bb3efd..d07adc8 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './vm.jade!'; +import templateUrl from './vm.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryVm', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade index cc39790..1f20613 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade @@ -37,7 +37,7 @@ include ../../../../../../../app/helpers/jade/mixins.jade li Hostname and port range (e.g. host1.com:47500..47510, host2:47502..47508, etc) | If port is 0 or not provided then default port will be used (depends on discovery SPI configuration)#[br] | If port range is provided (e.g. host:port1..port2) the following should be considered: - ul: li port1 < port2 should be true + ul: li port1 < port2 should be true li Both port1 and port2 should be greater than 0 ignite-form-group-add(ng-click='group.add = [{}]') | Add new address http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js index 42925a9..3081443 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './zookeeper.jade!'; +import templateUrl from './zookeeper.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeper', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js index 68e338b..42fb229 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './bounded-exponential-backoff.jade!'; +import templateUrl from './bounded-exponential-backoff.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperBoundedExponential', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js index dfd9b08..969356b 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './custom.jade!'; +import templateUrl from './custom.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperCustom', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js index 29c968c..e68dff6 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './exponential-backoff.jade!'; +import templateUrl from './exponential-backoff.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperExponential', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js index ec39f66..38bc2d8 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './forever.jade!'; +import templateUrl from './forever.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperForever', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]];