call restartTimer when blinking is set to true

rstudio · Sep 4, 2012 · e120bab · e120bab
1 parent 3f78af5
commit e120bab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace-uncompressed.js b/...src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace-uncompressed.js
@@ -17747,6 +17747,8 @@ var Cursor = function(parentEl) {
 
     this.setBlinking = function(blinking) {
         this.isBlinking = blinking;
+        if (blinking)
+            this.restartTimer();
     };
 
     this.addCursor = function() {

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace.js b/src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace.js
diff --git a/src/gwt/tools/sync-ace-commits b/src/gwt/tools/sync-ace-commits
@@ -76,7 +76,7 @@ git merge \
     origin/patch/emacs-vim-keybindings
 
 git merge \
-    origin/patch/disable-blinking-cursor
+    origin/patch/blinking-cursor
 
 
 node ./Makefile.dryice.js normal