Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE78F18D17 for ; Thu, 1 Oct 2015 09:57:14 +0000 (UTC) Received: (qmail 33353 invoked by uid 500); 1 Oct 2015 09:57:14 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 33318 invoked by uid 500); 1 Oct 2015 09:57:14 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 33309 invoked by uid 99); 1 Oct 2015 09:57:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2015 09:57:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47595E03C7; Thu, 1 Oct 2015 09:57:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-843 Sql editor change font for same height under all platforms Date: Thu, 1 Oct 2015 09:57:14 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843 45f5db633 -> dd9c3e3f3 ignite-843 Sql editor change font for same height under all platforms Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd9c3e3f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd9c3e3f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd9c3e3f Branch: refs/heads/ignite-843 Commit: dd9c3e3f3d83a9a7a9274d533204fff91083fe64 Parents: 45f5db6 Author: Andrey Authored: Thu Oct 1 16:57:03 2015 +0700 Committer: Andrey Committed: Thu Oct 1 16:57:03 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd9c3e3f/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 1bb79f2..8654d07 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 @@ -143,6 +143,7 @@ consoleModule.controller('sqlController', renderer.setHighlightGutterLine(false); renderer.setShowPrintMargin(false); + renderer.setOption('fontFamily', 'monospace'); renderer.setOption('fontSize', '14px'); renderer.setOption('minLines', '5'); renderer.setOption('maxLines', '15'); @@ -503,9 +504,11 @@ consoleModule.controller('sqlController', _cancelRefresh(paragraph); + paragraph.queryArgs = { cacheName: paragraph.cacheName }; + _showLoading(paragraph, true); - $http.post('/agent/query', {query: 'EXPLAIN ' + paragraph.query, pageSize: paragraph.pageSize, cacheName: paragraph.cacheName}) + $http.post('/agent/query', paragraph.queryArgs) .success(_processQueryResult(paragraph)) .error(function (errMsg) { paragraph.errMsg = errMsg; @@ -521,9 +524,11 @@ consoleModule.controller('sqlController', _cancelRefresh(paragraph); + paragraph.queryArgs = { cacheName: paragraph.cacheName }; + _showLoading(paragraph, true); - $http.post('/agent/scan', {pageSize: paragraph.pageSize, cacheName: paragraph.cacheName}) + $http.post('/agent/scan', paragraph.queryArgs) .success(_processQueryResult(paragraph)) .error(function (errMsg) { paragraph.errMsg = errMsg;