Only call CM.focus() if CM is not already focused.

ipython · Jan 30, 2014 · a759238 · a759238
1 parent b91d6a6
commit a759238
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/IPython/html/static/notebook/js/cell.js b/IPython/html/static/notebook/js/cell.js
@@ -288,8 +288,16 @@ var IPython = (function (IPython) {
      * @method focus_editor
      */
     Cell.prototype.focus_editor = function () {
+        var that = this;
         this.refresh();
-        this.code_mirror.focus();
+        // Only focus the CM editor if it is not focused already. This prevents jumps
+        // related to the previous prompt position.
+        setTimeout(function () {
+            var isf = IPython.utils.is_focused;
+            if (!isf(that.element.find('div.CodeMirror'))) {
+                this.code_mirror.focus();
+            }
+        }, 1);
     }
 
     /**