Move the activeElement check to the base editor

Xorbert · Nov 18, 2015 · 8ad53a9 · 8ad53a9
1 parent 7029ca3
commit 8ad53a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/core.js b/src/core.js
@@ -1170,12 +1170,6 @@ Handsontable.Core = function Core(rootElement, userSettings) {
    */
   this.listen = function() {
     Handsontable.activeGuid = instance.guid;
-
-    if (document.activeElement && document.activeElement !== document.body) {
-      document.activeElement.blur();
-    } else if (!document.activeElement) { //IE
-      document.body.focus();
-    }
   };
 
   /**

diff --git a/src/editors/_baseEditor.js b/src/editors/_baseEditor.js
@@ -58,6 +58,12 @@ BaseEditor.prototype.prepare = function(row, col, prop, td, originalValue, cellP
   this.originalValue = originalValue;
   this.cellProperties = cellProperties;
 
+  if (this.instance.view.isMouseDown() && document.activeElement && document.activeElement !== document.body) {
+    document.activeElement.blur();
+  } else if (!document.activeElement) { //IE
+    document.body.focus();
+  }
+
   this.state = Handsontable.EditorState.VIRGIN;
 };