You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/11/18 03:53:14 UTC
ignite git commit: IGNITE-1686 Expand panel.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 50c8fd96e -> 304cd28a0
IGNITE-1686 Expand panel.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/304cd28a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/304cd28a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/304cd28a
Branch: refs/heads/ignite-843-rc1
Commit: 304cd28a040d01a51c1abb6f80cf180aeaa778e2
Parents: 50c8fd9
Author: Andrey <an...@gridgain.com>
Authored: Wed Nov 18 09:53:03 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Nov 18 09:53:03 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 +-
.../src/main/js/controllers/sql-controller.js | 43 +++++++++++---------
.../src/main/js/views/sql/sql.jade | 4 +-
3 files changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/304cd28a/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 238a5c8..384df07 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
@@ -506,7 +506,7 @@ consoleModule.service('$common', [
if (!activePanels || activePanels.length < 1)
panels.activePanels = [idx];
else if (!_.contains(activePanels, idx)) {
- var newActivePanels = activePanels.slice();
+ var newActivePanels = angular.copy(activePanels);
newActivePanels.push(idx);
http://git-wip-us.apache.org/repos/asf/ignite/blob/304cd28a/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index f7e5ce5..c67f7c2 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -128,20 +128,31 @@ consoleModule.controller('sqlController',
$scope.scrollParagraphs = $scope.notebook.paragraphs.map(function (paragraph) {
return {
"text": paragraph.name,
- "click": 'scrollToParagraph(' + paragraph.id + ')'
+ "click": 'scrollToParagraph("' + paragraph.id + '")'
};
});
};
$scope.scrollToParagraph = function (paragraphId) {
- $location.hash('paragraph-' + paragraphId);
+ var idx = _.findIndex($scope.notebook.paragraphs, {id: paragraphId});
- $anchorScroll();
+ if (idx >= 0) {
+ if (!_.contains($scope.notebook.activePanels, idx)) {
+ var activePanels = angular.copy($scope.notebook.activePanels);
- var paragraph = _.find($scope.notebook.paragraphs, {id: paragraphId});
+ activePanels.push(idx);
- if (paragraph)
- paragraph.ace.focus();
+ $scope.notebook.activePanels = activePanels;
+ }
+
+ setTimeout(function () {
+ $scope.notebook.paragraphs[idx].ace.focus();
+ });
+ }
+
+ $location.hash(paragraphId);
+
+ $anchorScroll();
};
var _hideColumn = function (col) {
@@ -237,10 +248,8 @@ consoleModule.controller('sqlController',
$scope.notebook_name = notebook.name;
- $scope.expandedParagraphs = notebook.expandedParagraphs;
-
_.forEach(notebook.paragraphs, function (paragraph) {
- paragraph.id = paragraphId++;
+ paragraph.id = 'paragraph-' + paragraphId++;
enhanceParagraph(paragraph);
});
@@ -265,11 +274,7 @@ consoleModule.controller('sqlController',
loadNotebook();
var _saveNotebook = function (f) {
- var note = angular.copy($scope.notebook);
-
- note.expandedParagraphs = $scope.expandedParagraphs;
-
- $http.post('/notebooks/save', note)
+ $http.post('/notebooks/save', $scope.notebook)
.success(f || function() {})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -348,7 +353,7 @@ consoleModule.controller('sqlController',
var sz = $scope.notebook.paragraphs.length;
var paragraph = {
- id: paragraphId++,
+ id: 'paragraph-' + paragraphId++,
name: 'Query' + (sz ==0 ? '' : sz),
editor: true,
query: '',
@@ -367,13 +372,13 @@ consoleModule.controller('sqlController',
if ($scope.caches && $scope.caches.length > 0)
paragraph.cacheName = $scope.caches[0].name;
- $scope.expandedParagraphs.push($scope.notebook.paragraphs.length);
-
$scope.notebook.paragraphs.push(paragraph);
+ $scope.notebook.activePanels.push($scope.notebook.paragraphs.length);
+
$scope.rebuildScrollParagraphs();
- $location.hash('paragraph-' + paragraph.id);
+ $location.hash(paragraph.id);
$anchorScroll();
@@ -429,7 +434,7 @@ consoleModule.controller('sqlController',
return paragraph == item;
});
- var panel_idx = _.findIndex($scope.expandedParagraphs, function (item) {
+ var panel_idx = _.findIndex($scope.notebook.activePanels, function (item) {
return paragraph_idx == item;
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/304cd28a/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 25be312..6e4a2b7 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -102,9 +102,9 @@ block container
.btn-group(style='margin-top: 2px')
+btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
.docs-body.paragraphs
- .panel-group(bs-collapse ng-model='expandedParagraphs' data-allow-multiple='true' data-start-collapsed='false')
+ .panel-group(bs-collapse ng-model='notebook.activePanels' data-allow-multiple='true' data-start-collapsed='false')
.panel.panel-default(ng-repeat='paragraph in notebook.paragraphs')
- .panel-heading(id='paragraph-{{paragraph.id}}' bs-collapse-toggle)
+ .panel-heading(id='{{paragraph.id}}' bs-collapse-toggle)
.row
.col-sm-6(ng-hide='paragraph.edit')
i.tipLabel.fa(ng-class='paragraphExpanded(paragraph) ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')