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 55B3018EBD for ; Wed, 28 Oct 2015 04:29:30 +0000 (UTC) Received: (qmail 50619 invoked by uid 500); 28 Oct 2015 04:29:30 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 50583 invoked by uid 500); 28 Oct 2015 04:29:30 -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 50574 invoked by uid 99); 28 Oct 2015 04:29:30 -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; Wed, 28 Oct 2015 04:29:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8998E027F; Wed, 28 Oct 2015 04:29:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <8f90514850ba4786900b237cb084c4f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-1799 Fixed not needed highlighting in special case. Date: Wed, 28 Oct 2015 04:29:29 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 0d8c5e311 -> 91aab57bb IGNITE-1799 Fixed not needed highlighting in special case. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91aab57b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91aab57b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91aab57b Branch: refs/heads/ignite-843-rc1 Commit: 91aab57bb666f64df2879b17cdcfe68faf588279 Parents: 0d8c5e3 Author: vsisko Authored: Wed Oct 28 11:29:30 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Oct 28 11:29:30 2015 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/controllers/common-module.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/91aab57b/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 e646d30..6038732 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 @@ -1369,7 +1369,7 @@ consoleModule.service('$preview', ['$timeout', '$interval', function ($timeout, var newContent = content.lines; if (content.action == 'remove') - prevContent = content.lines; + prevContent = newContent; else if (prevContent.length > 0 && newContent.length > 0 && editor.attractAttention) { if (clearPromise) { $timeout.cancel(clearPromise); @@ -1469,7 +1469,6 @@ consoleModule.service('$preview', ['$timeout', '$interval', function ($timeout, } else editor.attractAttention = true; - } return { @@ -1478,7 +1477,7 @@ consoleModule.service('$preview', ['$timeout', '$interval', function ($timeout, preview.setOption('highlightActiveLine', false); preview.setAutoScrollEditorIntoView(true); preview.$blockScrolling = Infinity; - preview.attractAttention = true; + preview.attractAttention = false; var renderer = preview.renderer;