http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/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..3d84b4e 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,9 +15,9 @@ * limitations under the License. */ -import template from './checkbox.jade!'; +import templateUrl from './checkbox.jade'; -export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', '$table', (guid, $table) => { +export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', 'IgniteLegacyTable', (guid, LegacyTable) => { const link = (scope, el, attrs, [form, label]) => { const {id, name} = scope; const field = form[name]; @@ -40,9 +40,8 @@ export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', '$table', (gu scope.$watch(() => form.$pristine, setAsDefault); scope.$watch('value', setAsDefault); - // TODO LEGACY scope.tableReset = () => { - $table.tableSaveAndReset(); + LegacyTable.tableSaveAndReset(); }; }; @@ -59,7 +58,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/c38b3ba2/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..6c43a2a 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,9 +15,9 @@ * limitations under the License. */ -import template from './datalist.jade!'; +import templateUrl from './datalist.jade'; -export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (guid, $table) => { +export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', 'IgniteLegacyTable', (guid, LegacyTable) => { const link = (scope, element, attrs, [ngModel, form, label], transclude) => { const {id, ngModelName} = scope; @@ -86,9 +86,8 @@ export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (gu scope.value = ngModel.$modelValue; }; - // TODO LEGACY scope.tableReset = () => { - $table.tableSaveAndReset(); + LegacyTable.tableSaveAndReset(); }; transclude(scope.$parent, function(clone, tscope) { @@ -115,7 +114,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/c38b3ba2/modules/web-console/src/main/js/app/modules/form/field/input/datalist.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.jade b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.jade index 723b348..7ae1411 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.jade +++ b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.jade @@ -43,7 +43,7 @@ mixin feedback(isCheckPristine, error, errorMessage) bs-options='item for item in options' container='body' data-min-length='1' - retain-selection + ignite-retain-selection ) +feedback(true, 'required', '{{ label.name }} could not be empty!') http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/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..0d21f5b 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,9 +15,9 @@ * limitations under the License. */ -import template from './number.jade!'; +import templateUrl from './number.jade'; -export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', '$table', (guid, $table) => { +export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', 'IgniteLegacyTable', (guid, LegacyTable) => { const link = (scope, el, attrs, [form, label]) => { const {id, name} = scope; const field = form[name]; @@ -46,9 +46,8 @@ export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', '$table', (guid scope.$watch(() => form.$pristine, setAsDefault); scope.$watch('value', setAsDefault); - // TODO LEGACY scope.tableReset = () => { - $table.tableSaveAndReset(); + LegacyTable.tableSaveAndReset(); }; }; @@ -69,7 +68,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/c38b3ba2/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..56c02b5 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,10 +15,10 @@ * 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) => { +export default ['igniteFormFieldInputText', ['IgniteFormGUID', 'IgniteLegacyTable', (guid, LegacyTable) => { const link = (scope, element, attrs, [ngModel, form, label], transclude) => { const {id, ngModelName} = scope; @@ -90,9 +90,8 @@ export default ['igniteFormFieldInputText', ['IgniteFormGUID', '$table', (guid, scope.value = ngModel.$modelValue; }; - // TODO LEGACY scope.tableReset = () => { - $table.tableSaveAndReset(); + LegacyTable.tableSaveAndReset(); }; transclude(scope.$parent, function(clone, tscope) { @@ -119,7 +118,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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/modules/web-console/src/main/js/app/modules/form/panel/revert.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/panel/revert.directive.js b/modules/web-console/src/main/js/app/modules/form/panel/revert.directive.js index 2bf4c8c..d60efb8 100644 --- a/modules/web-console/src/main/js/app/modules/form/panel/revert.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/panel/revert.directive.js @@ -17,7 +17,7 @@ const template = '<i ng-show="form.$dirty" class="fa fa-undo pull-right" ng-click="revert($event)"></i>'; -export default ['igniteFormRevert', ['$tooltip', '$table', ($tooltip, $table) => { +export default ['igniteFormRevert', ['$tooltip', 'IgniteLegacyTable', ($tooltip, LegacyTable) => { const link = (scope, $element, $attrs, [form]) => { $tooltip($element, { title: 'Undo unsaved changes' }); @@ -26,7 +26,7 @@ export default ['igniteFormRevert', ['$tooltip', '$table', ($tooltip, $table) => scope.revert = (e) => { e.stopPropagation(); - $table.tableReset(); + LegacyTable.tableReset(); _.forOwn(form.$defaults, (value, name) => { const field = form[name]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/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/c38b3ba2/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..064b4c2 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', ['IgniteLoading', '$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'; @@ -30,7 +30,7 @@ export default ['igniteLoading', ['$loading', '$compile', ($loading, $compile) = if (!scope.loading) { scope.loading = loading; - $loading.add(scope.key || 'defaultSpinnerKey', scope.loading); + Loading.add(scope.key || 'defaultSpinnerKey', scope.loading); element.append(scope.loading); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/loading/loading.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/loading/loading.service.js b/modules/web-console/src/main/js/app/modules/loading/loading.service.js index 0664884..ec31c1a 100644 --- a/modules/web-console/src/main/js/app/modules/loading/loading.service.js +++ b/modules/web-console/src/main/js/app/modules/loading/loading.service.js @@ -15,7 +15,7 @@ * limitations under the License. */ -export default ['$loading', ['$timeout', ($timeout) => { +export default ['IgniteLoading', ['$timeout', ($timeout) => { const _overlays = {}; const start = (key) => { http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/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/c38b3ba2/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/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.jade b/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.jade index b5e0797..44304bf 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.jade +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.jade @@ -49,7 +49,7 @@ form.panel.panel-default(name='general' novalidate) </ul>') .settings-row(data-ng-show='#{model}.cacheMode === "PARTITIONED"') +number('Backups:', model + '.backups', 'backups', 'true', '0', '0', 'Number of nodes used to back up single partition for partitioned cache') - .settings-row(data-ng-show='#{model}.backups && #{model}.cacheMode !== "LOCAL"') + .settings-row(data-ng-show='#{model}.cacheMode === "PARTITIONED" && #{model}.backups') +checkbox('Read from backup', model + '.readFromBackup', 'readFromBackup', 'Flag indicating whether data can be read from backup<br/>\ If not set then always get data from primary node (never from backup)') http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade index cb26d03..6361e28 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade +++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade @@ -67,8 +67,8 @@ mixin hibernateField(items, field, valid, save, newItem) data-ignite-property-unique=items data-ignite-property-value-specified data-ignite-form-field-input-autofocus='true' - on-enter=onEnter - on-escape=reset + ignite-on-enter=onEnter + ignite-on-escape=reset ng-blur=onBlur ) block http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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/c38b3ba2/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 }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js index ce83da4..f369af8 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './n-times.jade!'; +import templateUrl from './n-times.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperNTimes', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js index 7329cc2..e9e114d 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './one-time.jade!'; +import templateUrl from './one-time.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperOneTime', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js index 8997159..4ab76b2 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './until-elapsed.jade!'; +import templateUrl from './until-elapsed.jade'; export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperUntilElapsed', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js index 1d0e3d8..74d4826 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './igfs.jade!'; +import templateUrl from './igfs.jade'; export default ['igniteConfigurationClustersIgfs', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js index 3df231f..8aec165 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './logger.jade!'; +import templateUrl from './logger.jade'; export default ['igniteConfigurationClustersLogger', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js index 5bd586b..999a3ca 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './custom.jade!'; +import templateUrl from './custom.jade'; export default ['igniteConfigurationClustersLoggerCustom', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js index 64e4337..32f55e9 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './log4j.jade!'; +import templateUrl from './log4j.jade'; export default ['igniteConfigurationClustersLoggerLog4j', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js index ad891f7..81ae296 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './log4j2.jade!'; +import templateUrl from './log4j2.jade'; export default ['igniteConfigurationClustersLoggerLog4j2', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js index 6c266a8..b4175b0 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './marshaller.jade!'; +import templateUrl from './marshaller.jade'; export default ['igniteConfigurationClustersMarshaller', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js index fc572a6..9b8ddc3 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './metrics.jade!'; +import templateUrl from './metrics.jade'; export default ['igniteConfigurationClustersMetrics', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js index d875c59..ded5bf0 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './ssl.jade!'; +import templateUrl from './ssl.jade'; export default ['igniteConfigurationClustersSsl', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js index db83d50..c340c4b 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './swap.jade!'; +import templateUrl from './swap.jade'; export default ['igniteConfigurationClustersSwap', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js index dabc574..f504e67 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './thread.jade!'; +import templateUrl from './thread.jade'; export default ['igniteConfigurationClustersThread', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js index b55b8a1..8ab3e89 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './time.jade!'; +import templateUrl from './time.jade'; export default ['igniteConfigurationClustersTime', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js index 985de49..faca0fa 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './transactions.jade!'; +import templateUrl from './transactions.jade'; export default ['igniteConfigurationClustersTransactions', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js index ab03eb0..9ca02f9 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './general.jade!'; +import templateUrl from './general.jade'; export default ['igniteConfigurationDomainsGeneral', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js index c5aa79e..2033394 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './query.jade!'; +import templateUrl from './query.jade'; export default ['igniteConfigurationDomainsQuery', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.jade b/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.jade index f66de92..9ac0d00 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.jade +++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.jade @@ -39,15 +39,15 @@ mixin table-index-item-edit(prefix, index, sortAvailable, idAddition) .col-xs-8.col-sm-8.col-md-8(ng-show=sortAvailable) label.fieldSep / .input-tip - input.form-control(id='{{::"#{fieldName}S" + #{idAddition}}}' enter-focus-next='{{::"#{direction}S" + #{idAddition}}}' type='text' ng-model=fieldNameModel placeholder='Field name' on-escape='tableReset()') + input.form-control(id='{{::"#{fieldName}S" + #{idAddition}}}' ignite-on-enter-focus-move='{{::"#{direction}S" + #{idAddition}}}' type='text' ng-model=fieldNameModel placeholder='Field name' ignite-on-escape='tableReset()') .col-xs-4.col-sm-4.col-md-4(ng-show=sortAvailable) +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id='{{::"#{direction}S" + #{idAddition}}}' ng-model=directionModel bs-select bs-options='item.value as item.label for item in {{sortDirections}}' on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0') + button.select-toggle.form-control(id='{{::"#{direction}S" + #{idAddition}}}' ng-model=directionModel bs-select bs-options='item.value as item.label for item in {{sortDirections}}' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset()' tabindex='0') .col-xs-12(ng-show='!(#{sortAvailable})') +btn-save(btnVisible, btnSave) .input-tip - input.form-control(id='{{::"#{fieldName}" + #{idAddition}}}' type='text' ng-model=fieldNameModel placeholder='Field name' on-enter=btnVisibleAndSave on-escape='tableReset()') + input.form-control(id='{{::"#{fieldName}" + #{idAddition}}}' type='text' ng-model=fieldNameModel placeholder='Field name' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset()') form.panel.panel-default(name='query' novalidate) .panel-heading(bs-collapse-toggle) @@ -134,11 +134,11 @@ form.panel.panel-default(name='query' novalidate) .col-sm-7 label.fieldSep / .input-tip - input.form-control(id='curIndexName{{$index}}' type='text' enter-focus-next='curIndexType{{$index}}' ng-model='indexesTbl.curIndexName' placeholder='Index name' on-enter=btnVisibleAndSave on-escape='tableReset()') + input.form-control(id='curIndexName{{$index}}' type='text' ignite-on-enter-focus-move='curIndexType{{$index}}' ng-model='indexesTbl.curIndexName' placeholder='Index name' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset()') .col-sm-5 +btn-save('tableIndexSaveVisible(indexesTbl, $index)', 'tableIndexSave(indexesTbl, $index)') .input-tip - button.select-toggle.form-control(id='curIndexType{{$index}}' bs-select ng-model='indexesTbl.curIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') + button.select-toggle.form-control(id='curIndexType{{$index}}' bs-select ng-model='indexesTbl.curIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset()') .margin-left-dflt table.links-edit-sub(st-table='item.fields' ng-init='itemIndex = $index') tbody @@ -160,10 +160,10 @@ form.panel.panel-default(name='query' novalidate) .col-sm-7 .fieldSep / .input-tip - input#newIndexName.form-control(type='text' enter-focus-next='newIndexType' ng-model='indexesTbl.newIndexName' placeholder='Index name' on-enter='tableIndexSaveVisible(indexesTbl, -1) && tableIndexSave(indexesTbl, -1)' on-escape='tableReset()') + input#newIndexName.form-control(type='text' ignite-on-enter-focus-move='newIndexType' ng-model='indexesTbl.newIndexName' placeholder='Index name' ignite-on-enter='tableIndexSaveVisible(indexesTbl, -1) && tableIndexSave(indexesTbl, -1)' ignite-on-escape='tableReset()') .col-sm-5 +btn-save('tableIndexSaveVisible(indexesTbl, -1)', 'tableIndexSave(indexesTbl, -1)') .input-tip - button#newIndexType.select-toggle.form-control(bs-select ng-model='indexesTbl.newIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') + button#newIndexType.select-toggle.form-control(bs-select ng-model='indexesTbl.newIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset()') .col-sm-6 +preview-xml-java(model, 'domainModelQuery') http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js index 39dc184..a69b025 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './store.jade!'; +import templateUrl from './store.jade'; export default ['igniteConfigurationDomainsStore', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade index d2a1dc6..8d3c65b 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade +++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade @@ -43,15 +43,15 @@ mixin table-db-field-edit(tbl, prefix, focusId, index) .col-xs-3.col-sm-3.col-md-3 .fieldSep / .input-tip - input.form-control(id=databaseNameId enter-focus-next=databaseTypeId type='text' ng-model=databaseNameModel placeholder='DB name' on-enter='#{javaNameModel} = #{javaNameModel} ? #{javaNameModel} : #{databaseNameModel}' on-escape='tableReset()') + input.form-control(id=databaseNameId ignite-on-enter-focus-move=databaseTypeId type='text' ng-model=databaseNameModel placeholder='DB name' ignite-on-enter='#{javaNameModel} = #{javaNameModel} ? #{javaNameModel} : #{databaseNameModel}' ignite-on-escape='tableReset()') .col-xs-3.col-sm-3.col-md-3 .fieldSep / .input-tip - button.select-toggle.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel data-placeholder='DB type' ng-class='{placeholder: !#{databaseTypeModel}}' bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}' on-escape='tableReset()' tabindex='0') + button.select-toggle.form-control(id=databaseTypeId ignite-on-enter-focus-move=javaNameId ng-model=databaseTypeModel data-placeholder='DB type' ng-class='{placeholder: !#{databaseTypeModel}}' bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}' ignite-on-escape='tableReset()' tabindex='0') .col-xs-3.col-sm-3.col-md-3 .fieldSep / .input-tip - input.form-control(id=javaNameId enter-focus-next=javaTypeId type='text' ng-model=javaNameModel placeholder='Java name' on-escape='tableReset()') + input.form-control(id=javaNameId ignite-on-enter-focus-move=javaTypeId type='text' ng-model=javaNameModel placeholder='Java name' ignite-on-escape='tableReset()') .col-xs-3.col-sm-3.col-md-3 -var btnVisible = 'tableDbFieldSaveVisible(' + tbl + ', ' + index +')' -var btnSave = 'tableDbFieldSave(' + tbl + ', ' + index +')' @@ -59,7 +59,7 @@ mixin table-db-field-edit(tbl, prefix, focusId, index) +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id=javaTypeId ng-model=javaTypeModel data-placeholder='Java type' ng-class='{placeholder: !#{javaTypeModel}}' bs-select bs-options='item.value as item.label for item in {{supportedJavaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0') + button.select-toggle.form-control(id=javaTypeId ng-model=javaTypeModel data-placeholder='Java type' ng-class='{placeholder: !#{javaTypeModel}}' bs-select bs-options='item.value as item.label for item in {{supportedJavaTypes}}' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset()' tabindex='0') form.panel.panel-default(name=form novalidate) .panel-heading(bs-collapse-toggle='' ng-click='ui.loadPanel("#{form}")') http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js index 109fa63..c5afc4e 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './dual.jade!'; +import templateUrl from './dual.jade'; export default ['igniteConfigurationIgfsDual', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.jade b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.jade index ba2e182..8129f0d 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.jade +++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.jade @@ -32,8 +32,8 @@ form.panel.panel-default(name=form novalidate) .col-sm-6 .settings-row +number('Maximum pending puts size:', model + '.dualModeMaxPendingPutsSize', 'dualModeMaxPendingPutsSize', 'true', '0', 'Number.MIN_SAFE_INTEGER', - 'Maximum amount of pending data read from the secondary file system and waiting to be written to data cache\ - 0 or negative value stands for unlimited size') + 'Maximum amount of pending data read from the secondary file system and waiting to be written to data cache<br/>\ + Zero or negative value stands for unlimited size') .settings-row +java-class('Put executor service:', model + '.dualModePutExecutorService', 'dualModePutExecutorService', 'true', 'false', 'DUAL mode put operation executor service') .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js index f93c76c..d008933 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './fragmentizer.jade!'; +import templateUrl from './fragmentizer.jade'; export default ['igniteConfigurationIgfsFragmentizer', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c38b3ba2/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js index 294c3b8..bda5418 100644 --- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js +++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js @@ -15,13 +15,13 @@ * limitations under the License. */ -import template from './general.jade!'; +import templateUrl from './general.jade'; export default ['igniteConfigurationIgfsGeneral', [() => { return { scope: true, restrict: 'E', - template, + templateUrl, replace: true }; }]];
