ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-1799 Fixed not needed highlighting in special case.
Date Wed, 28 Oct 2015 04:29:29 GMT
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 <vsisko@gridgain.com>
Authored: Wed Oct 28 11:29:30 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
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;
 


Mime
View raw message