Repository: ignite Updated Branches: refs/heads/ignite-843 b81de27d1 -> e48ee8d3f
IGNITE-843 WIP on preview. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e48ee8d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e48ee8d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e48ee8d3 Branch: refs/heads/ignite-843 Commit: e48ee8d3fc39d6069f8482364cdffe138c3c09d0 Parents: b81de27 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Aug 25 17:20:51 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Aug 25 17:20:51 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 7 +++++++ .../src/main/js/controllers/common-module.js | 12 +++++++++-- .../main/js/routes/generator/generator-xml.js | 21 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e48ee8d3/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 fc97cbd..0062c21 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 @@ -251,6 +251,13 @@ controlCenterModule.controller('cachesController', [ sessionStorage.cacheBackupItem = angular.toJson(val); $scope.preview.general = $generatorXml.cacheGeneral(val).join(''); + $scope.preview.memory = $generatorXml.cacheMemory(val).join(''); + $scope.preview.query = $generatorXml.cacheQuery(val).join(''); + $scope.preview.store = $generatorXml.cacheStore(val).join(''); + $scope.preview.concurrency = $generatorXml.cacheConcurrency(val).join(''); + $scope.preview.rebalance = $generatorXml.cacheRebalance(val).join(''); + $scope.preview.serverNearCache = $generatorXml.serverNearCache(val).join(''); + $scope.preview.statistics = $generatorXml.statistics(val).join(''); } }, true); http://git-wip-us.apache.org/repos/asf/ignite/blob/e48ee8d3/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 1e0bf72..afdd7f0 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 @@ -489,7 +489,7 @@ controlCenterModule.service('$common', [ var parent = right.parent(); - var parentHeight = Math.max(75, left.height() - 2 * parent.css('marginTop').replace("px", "")); + var parentHeight = Math.max(75, left.height() - parent.css('marginTop').replace("px", "")); parent.outerHeight(parentHeight); @@ -654,10 +654,18 @@ controlCenterModule.service('$common', [ }) }, initPreview: function () { + MutationObserver = window.MutationObserver || window.WebKitMutationObserver; + $('.panel-collapse').each(function (ix, el) { - $('#' + el.id + '-left').bind('DOMSubtreeModified', function () { + var observer = new MutationObserver(function(mutations, observer) { resizePreview(el); }); + + observer.observe($('#' + el.id + '-left')[0], { + childList: true, + attributes: true, + subtree: true + }); }); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e48ee8d3/modules/control-center-web/src/main/js/routes/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js index be85924..d03a337 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js @@ -646,6 +646,27 @@ $generatorXml.cacheConcurrency = function(cache, res) { return res; }; +$generatorXml.cacheRebalance = function(cache, res) { + if (!res) + res = $generatorCommon.builder(); + + return res; +}; + +$generatorXml.serverNearCache = function(cache, res) { + if (!res) + res = $generatorCommon.builder(); + + return res; +}; + +$generatorXml.statistics = function(cache, res) { + if (!res) + res = $generatorCommon.builder(); + + return res; +}; + // Generate caches configs. $generatorXml.cache = function(cache, res) { if (!res)
