Repository: ignite Updated Branches: refs/heads/ignite-843 75e89abfc -> 0582c6005
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/0582c600 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0582c600 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0582c600 Branch: refs/heads/ignite-843 Commit: 0582c6005309b381b42ccb95a60c1bd43247e56e Parents: 75e89ab Author: Alexey Kuznetsov <[email protected]> Authored: Tue Aug 25 16:02:20 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Aug 25 16:02:20 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 8 +++++--- .../src/main/js/controllers/clusters-controller.js | 7 +++++++ .../src/main/js/controllers/common-module.js | 17 +++++++++++++---- .../src/main/js/controllers/metadata-controller.js | 5 ++++- 4 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0582c600/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 1b17f7f..5621dcf 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 @@ -94,6 +94,7 @@ controlCenterModule.controller('cachesController', [ $common.previewHeightUpdate(); }) }); + $scope.general = []; $scope.advanced = []; @@ -268,6 +269,10 @@ controlCenterModule.controller('cachesController', [ sessionStorage.cacheSelectedItem = angular.toJson(item); else sessionStorage.removeItem('cacheSelectedItem'); + + $timeout(function () { + $common.previewHeightUpdate(); + }) }; // Add new cache. @@ -295,9 +300,6 @@ controlCenterModule.controller('cachesController', [ return showPopoverMessage($scope.panels, 'general-data', 'cacheName', 'Name should not be empty'); sessionStorage.removeItem('cacheSelectedItem'); - $timeout(function () { - $common.previewHeightUpdate(); - }) if (item.memoryMode == 'OFFHEAP_TIERED' && item.offHeapMaxMemory == null) return showPopoverMessage($scope.panels, 'memory-data', 'offHeapMaxMemory', 'Off-heap max memory should be specified'); http://git-wip-us.apache.org/repos/asf/ignite/blob/0582c600/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 02e5ad3..497892f 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 @@ -215,6 +215,10 @@ controlCenterModule.controller('clustersController', ['$scope', '$http', '$timeo $scope.preview.transactions = $generatorXml.transactions(val).join(''); } }, true); + + $timeout(function () { + $common.initPreview(); + }) }) .error(function (errMsg) { $common.showError(errMsg); @@ -232,6 +236,9 @@ controlCenterModule.controller('clustersController', ['$scope', '$http', '$timeo else $scope.backupItem = undefined; + $timeout(function () { + $common.previewHeightUpdate(); + }); if (item) sessionStorage.clusterSelectedItem = angular.toJson(item); http://git-wip-us.apache.org/repos/asf/ignite/blob/0582c600/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 0e99437..1e0bf72 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 @@ -485,13 +485,15 @@ controlCenterModule.service('$common', [ if (left.height() > 0) { var right = $('#' + el.id + '-right'); - var scrollHeight = right.find('.ace_scrollbar-h').height() + var scrollHeight = right.find('.ace_scrollbar-h').height(); - var parent = right.parent() + var parent = right.parent(); - parent.outerHeight(left.height() - 2 * parent.css('marginTop').replace("px", "")); + var parentHeight = Math.max(75, left.height() - 2 * parent.css('marginTop').replace("px", "")); - right.height(left.height() - scrollHeight - 2 * parent.css('marginTop').replace("px", "")); + parent.outerHeight(parentHeight); + + right.height(parentHeight - scrollHeight); right.resize(); } @@ -650,6 +652,13 @@ controlCenterModule.service('$common', [ $('.panel-collapse').each(function (ix, el) { resizePreview(el); }) + }, + initPreview: function () { + $('.panel-collapse').each(function (ix, el) { + $('#' + el.id + '-left').bind('DOMSubtreeModified', function () { + resizePreview(el); + }); + }); } } }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/0582c600/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 0af5635..09d6afa 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 @@ -186,6 +186,10 @@ controlCenterModule.controller('metadataController', [ $scope.selectedItem = sel; $scope.backupItem = bak; + + $timeout(function () { + $common.previewHeightUpdate(); + }) } $scope.selectAllSchemas = function () { @@ -497,7 +501,6 @@ controlCenterModule.controller('metadataController', [ $scope.selectedItem = sel; $timeout(function () { - $common.previewHeightUpdate(); $scope.$apply(); });
