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/09/18 12:01:36 UTC
[1/2] ignite git commit: # GG-843 Fixed cache metadata insert.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 a28fc4ab4 -> 738948664
# GG-843 Fixed cache metadata insert.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b595867c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b595867c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b595867c
Branch: refs/heads/ignite-843
Commit: b595867c3ec5acdd5ffd37435475a58306d3c15c
Parents: ee0fd43
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 18 17:01:06 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 18 17:01:06 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b595867c/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 3b057dc..7d3be69 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
@@ -91,7 +91,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
editor.setTheme('ace/theme/chrome');
- paragraph.ace = editor;
+ Object.defineProperty(paragraph, 'ace', { value: editor });
}
};
@@ -710,6 +710,13 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
$scope.dblclickMetadata = function (paragraph, node) {
paragraph.ace.insert(node.name);
+ var position = paragraph.ace.selection.getCursor();
+
+ paragraph.query = paragraph.ace.getValue();
+
+ setTimeout(function () {
+ paragraph.ace.selection.moveCursorToPosition(position);
+ }, 1);
};
$scope.tryLoadMetadata = function (cache) {
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73894866
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73894866
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73894866
Branch: refs/heads/ignite-843
Commit: 7389486643d7d818be67082242ec05f5e46969c4
Parents: b595867 a28fc4a
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 18 17:01:29 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 18 17:01:29 2015 +0700
----------------------------------------------------------------------
.../src/main/js/routes/admin.js | 2 +-
.../js/routes/generator/generator-common.js | 11 +-
.../main/js/routes/generator/generator-java.js | 348 ++++++++++++++++++-
.../main/js/routes/generator/generator-xml.js | 6 +-
.../src/main/js/routes/public.js | 4 +-
.../src/main/js/routes/summary.js | 18 +-
.../main/js/views/templates/batch-confirm.jade | 2 +-
7 files changed, 371 insertions(+), 20 deletions(-)
----------------------------------------------------------------------