Repository: ignite Updated Branches: refs/heads/ignite-843 39224cb15 -> 2b8acba3b
IGNITE-843 Fixed selection on save. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab832dc7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab832dc7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab832dc7 Branch: refs/heads/ignite-843 Commit: ab832dc74ab374b71cb9e4c9926e6bab1a0e8bcc Parents: 852772c Author: AKuznetsov <[email protected]> Authored: Sat Sep 5 00:46:21 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Sat Sep 5 00:46:21 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 52 ++++++---------- .../main/js/controllers/clusters-controller.js | 64 ++++++-------------- .../src/main/js/controllers/common-module.js | 37 +++++------ .../main/js/controllers/metadata-controller.js | 32 ++++------ 4 files changed, 66 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ab832dc7/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index b6b6e31..fffde43 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -48,7 +48,14 @@ controlCenterModule.controller('cachesController', [ $scope.tablePairSave = $table.tablePairSave; $scope.tablePairSaveVisible = $table.tablePairSaveVisible; - $scope.previewInit = $preview.previewInit; + var previews = []; + + $scope.previewInit = function (preview) { + previews.push(preview); + + $preview.previewInit(preview); + }; + $scope.previewChanged = $preview.previewChanged; $scope.formChanged = $common.formChanged; @@ -271,31 +278,6 @@ controlCenterModule.controller('cachesController', [ $scope.preview.statistics.java = $generatorJava.cacheStatistics(val, varName).join(''); $scope.preview.statistics.allDefaults = $common.isEmptyString($scope.preview.statistics.xml); } - else { - $scope.preview.general.xml = ' '; - $scope.preview.general.java = ' '; - - $scope.preview.memory.xml = ' '; - $scope.preview.memory.java = ' '; - - $scope.preview.query.xml = ' '; - $scope.preview.query.java = ' '; - - $scope.preview.store.xml = ' '; - $scope.preview.store.java = ' '; - - $scope.preview.concurrency.xml = ' '; - $scope.preview.concurrency.java = ' '; - - $scope.preview.rebalance.xml = ' '; - $scope.preview.rebalance.java = ' '; - - $scope.preview.serverNearCache.xml = ' '; - $scope.preview.serverNearCache.java = ' '; - - $scope.preview.statistics.xml = ' '; - $scope.preview.statistics.java = ' '; - } } // When landing on the page, get caches and show them. @@ -397,17 +379,17 @@ controlCenterModule.controller('cachesController', [ else sessionStorage.removeItem('cacheSelectedItem'); - generatePreview(); - - $timeout(function () { - if (backup) - $scope.backupItem = backup; - else if (item) - $scope.backupItem = angular.copy(item); - else - $scope.backupItem = undefined; + _.forEach(previews, function(preview) { + preview.attractAttention = false; }); + if (backup) + $scope.backupItem = backup; + else if (item) + $scope.backupItem = angular.copy(item); + else + $scope.backupItem = undefined; + $timeout(function () { if (changed) $common.markChanged($scope.ui.inputForm, 'cacheBackupItemChanged'); http://git-wip-us.apache.org/repos/asf/ignite/blob/ab832dc7/modules/control-center-web/src/main/js/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 44f39ff..c21e309 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -43,7 +43,14 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', ' $scope.tableSimpleDown = $table.tableSimpleDown; $scope.tableSimpleDownVisible = $table.tableSimpleDownVisible; - $scope.previewInit = $preview.previewInit; + var previews = []; + + $scope.previewInit = function (preview) { + previews.push(preview); + + $preview.previewInit(preview); + }; + $scope.previewChanged = $preview.previewChanged; $scope.formChanged = $common.formChanged; @@ -211,43 +218,6 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', ' $scope.preview.transactions.java = $generatorJava.clusterTransactions(val).join(''); $scope.preview.transactions.allDefaults = $common.isEmptyString($scope.preview.transactions.xml); } - else { - $scope.preview.general.xml = ' '; - $scope.preview.general.java = ' '; - - $scope.preview.atomics.xml = ' '; - $scope.preview.atomics.java = ' '; - - $scope.preview.communication.xml = ' '; - $scope.preview.communication.java = ' '; - - $scope.preview.deployment.xml = ' '; - $scope.preview.deployment.java = ' '; - - $scope.preview.events.xml = ' '; - $scope.preview.events.java = ' '; - - $scope.preview.marshaller.xml = ' '; - $scope.preview.marshaller.java = ' '; - - $scope.preview.metrics.xml = ' '; - $scope.preview.metrics.java = ' '; - - $scope.preview.p2p.xml = ' '; - $scope.preview.p2p.java = ' '; - - $scope.preview.swap.xml = ' '; - $scope.preview.swap.java = ' '; - - $scope.preview.time.xml = ' '; - $scope.preview.time.java = ' '; - - $scope.preview.pools.xml = ' '; - $scope.preview.pools.java = ' '; - - $scope.preview.transactions.xml = ' '; - $scope.preview.transactions.java = ' '; - } } // When landing on the page, get clusters and show them. @@ -325,17 +295,17 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', ' else sessionStorage.removeItem('clusterSelectedItem'); - generatePreview(); - - $timeout(function () { - if (backup) - $scope.backupItem = backup; - else if (item) - $scope.backupItem = angular.copy(item); - else - $scope.backupItem = undefined; + _.forEach(previews, function(preview) { + preview.attractAttention = false; }); + if (backup) + $scope.backupItem = backup; + else if (item) + $scope.backupItem = angular.copy(item); + else + $scope.backupItem = undefined; + $timeout(function () { if (changed) $common.markChanged($scope.ui.inputForm, 'clusterBackupItemChanged'); http://git-wip-us.apache.org/repos/asf/ignite/blob/ab832dc7/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 8f75500..72b3e8a 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -975,7 +975,7 @@ controlCenterModule.service('$table', ['$common', '$focus', function ($common, $ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($timeout, $interval) { var Range = require('ace/range').Range; - var previewPrevContent = []; + var prevContent = []; var animation = {editor: null, stage: 0, start: 0, stop: 0}; @@ -1061,13 +1061,13 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim var clearPromise = editor.clearPromise; - var previewNewContent = content.lines; + var newContent = content.lines; if (content.action == 'remove') - previewPrevContent = content.lines; - // Do not mark the text changes for special marker value: ' '. - else if (previewPrevContent.length > 0 && previewNewContent.length > 0 && previewNewContent[0] != ' ' - && previewPrevContent[0] != ' ') { + prevContent = content.lines; + else if (prevContent.length > 0 && newContent.length > 0 && editor.attractAttention) { + editor.attractAttention = true; + if (clearPromise) { $timeout.cancel(clearPromise); @@ -1079,8 +1079,8 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim var newIx = 0; var prevIx = 0; - var prevLen = previewPrevContent.length - (previewPrevContent[previewPrevContent.length - 1] == '' ? 1 : 0); - var newLen = previewNewContent.length - (previewNewContent[previewNewContent.length - 1] == '' ? 1 : 0); + var prevLen = prevContent.length - (prevContent[prevContent.length - 1] == '' ? 1 : 0); + var newLen = newContent.length - (newContent[newContent.length - 1] == '' ? 1 : 0); var selected = false; var scrollTo = -1; @@ -1091,7 +1091,7 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim // Find an index of a first line with different text. for (; (newIx < newLen || prevIx < prevLen) && start < 0; newIx++, prevIx++) { - if (previewNewContent[newIx] != previewPrevContent[prevIx]) { + if (newContent[newIx] != prevContent[prevIx]) { start = newIx; break; @@ -1102,7 +1102,7 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim // Find an index of a last line with different text by checking last string of old and new content in reverse order. for (var i = start; i < newLen && end < 0; i ++) { for (var j = prevIx; j < prevLen && end < 0; j ++) { - if (previewNewContent[i] == previewPrevContent[j] && previewNewContent[i] != '') { + if (newContent[i] == prevContent[j] && newContent[i] != '') { end = i; newIx = i; @@ -1144,18 +1144,19 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim editor.scrollToRow(scrollTo) } - previewPrevContent = []; + prevContent = []; } } return { - previewInit: function (editor) { - editor.setReadOnly(true); - editor.setOption('highlightActiveLine', false); - editor.setAutoScrollEditorIntoView(true); - editor.$blockScrolling = Infinity; + previewInit: function (preview) { + preview.setReadOnly(true); + preview.setOption('highlightActiveLine', false); + preview.setAutoScrollEditorIntoView(true); + preview.$blockScrolling = Infinity; + preview.attractAttention = true; - var renderer = editor.renderer; + var renderer = preview.renderer; renderer.setHighlightGutterLine(false); renderer.setShowPrintMargin(false); @@ -1163,7 +1164,7 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim renderer.setOption('minLines', '3'); renderer.setOption('maxLines', '50'); - editor.setTheme('ace/theme/chrome'); + preview.setTheme('ace/theme/chrome'); }, previewChanged: previewChanged } http://git-wip-us.apache.org/repos/asf/ignite/blob/ab832dc7/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index 9e418bf..f0173c9 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -56,7 +56,14 @@ controlCenterModule.controller('metadataController', [ $scope.tablePairSave = $table.tablePairSave; $scope.tablePairSaveVisible = $table.tablePairSaveVisible; - $scope.previewInit = $preview.previewInit; + var previews = []; + + $scope.previewInit = function (preview) { + previews.push(preview); + + $preview.previewInit(preview); + }; + $scope.previewChanged = $preview.previewChanged; $scope.formChanged = $common.formChanged; @@ -195,18 +202,18 @@ controlCenterModule.controller('metadataController', [ $scope.selectItem($scope.metadatas[0]); } - function setSelectedAndBackupItem(sel, bak, changed) { + function setSelectedAndBackupItem(sel, backup, changed) { function setSelectedAndBackupItem() { $table.tableReset(); $scope.selectedItem = sel; - generatePreview(); - - $timeout(function () { - $scope.backupItem = bak; + _.forEach(previews, function(preview) { + preview.attractAttention = false; }); + $scope.backupItem = backup; + $timeout(function () { if (changed) $common.markChanged($scope.ui.inputForm, 'metadataBackupItemChanged'); @@ -499,19 +506,6 @@ controlCenterModule.controller('metadataController', [ $scope.preview.store.java = $generatorJava.metadataStore(val).join(''); $scope.preview.store.allDefaults = $common.isEmptyString($scope.preview.store.xml); } - else { - $scope.preview.general.xml = ' '; - $scope.preview.general.java = ' '; - $scope.preview.general.allDefaults = ' '; - - $scope.preview.query.xml = ' '; - $scope.preview.query.java = ' '; - $scope.preview.query.allDefaults = ' '; - - $scope.preview.store.xml = ' '; - $scope.preview.store.java = ' '; - $scope.preview.store.allDefaults = ' '; - } } // When landing on the page, get metadatas and show them.
