clean up

lightCraft2020 · Feb 11, 2015 · a03e6be · a03e6be
1 parent 496c2ff
commit a03e6be
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 42 deletions.
diff --git a/lib/simditor.js b/lib/simditor.js
@@ -763,7 +763,7 @@ InputManager = (function(_super) {
   };
 
   InputManager.prototype._onKeyDown = function(e) {
-    var $blockEl, $newBlockEl, metaKey, result, _base, _ref, _ref1;
+    var result, _base, _ref, _ref1;
     if (this.editor.triggerHandler(e) === false) {
       return false;
     }
@@ -797,21 +797,10 @@ InputManager = (function(_super) {
     if ((_ref = e.which, __indexOf.call(this._modifierKeys, _ref) >= 0) || (_ref1 = e.which, __indexOf.call(this._arrowKeys, _ref1) >= 0)) {
       return;
     }
-    metaKey = this.editor.util.metaKey(e);
-    $blockEl = this.editor.util.closestBlockEl();
-    if (metaKey && e.which === 86) {
+    if (this.editor.util.metaKey(e) && e.which === 86) {
       return;
     }
-    if (this.editor.util.browser.webkit && e.which === 8 && this.editor.selection.rangeAtStartOf($blockEl)) {
-      if (!this.focused) {
-        return;
-      }
-      $newBlockEl = this.editor.util.closestBlockEl();
-      this.editor.selection.save();
-      this.editor.formatter.cleanNode($newBlockEl, true);
-      this.editor.selection.restore();
-    }
-    if (this.editor.util.support.oninput) {
+    if (!this.editor.util.support.oninput) {
       this.throttledTrigger('valuechanged', ['typing']);
     }
     return null;

diff --git a/site/assets/scripts/simditor.js b/site/assets/scripts/simditor.js
@@ -763,7 +763,7 @@ InputManager = (function(_super) {
   };
 
   InputManager.prototype._onKeyDown = function(e) {
-    var $blockEl, $newBlockEl, metaKey, result, _base, _ref, _ref1;
+    var result, _base, _ref, _ref1;
     if (this.editor.triggerHandler(e) === false) {
       return false;
     }
@@ -797,21 +797,10 @@ InputManager = (function(_super) {
     if ((_ref = e.which, __indexOf.call(this._modifierKeys, _ref) >= 0) || (_ref1 = e.which, __indexOf.call(this._arrowKeys, _ref1) >= 0)) {
       return;
     }
-    metaKey = this.editor.util.metaKey(e);
-    $blockEl = this.editor.util.closestBlockEl();
-    if (metaKey && e.which === 86) {
+    if (this.editor.util.metaKey(e) && e.which === 86) {
       return;
     }
-    if (this.editor.util.browser.webkit && e.which === 8 && this.editor.selection.rangeAtStartOf($blockEl)) {
-      if (!this.focused) {
-        return;
-      }
-      $newBlockEl = this.editor.util.closestBlockEl();
-      this.editor.selection.save();
-      this.editor.formatter.cleanNode($newBlockEl, true);
-      this.editor.selection.restore();
-    }
-    if (this.editor.util.support.oninput) {
+    if (!this.editor.util.support.oninput) {
       this.throttledTrigger('valuechanged', ['typing']);
     }
     return null;

diff --git a/src/inputManager.coffee b/src/inputManager.coffee
@@ -208,22 +208,10 @@ class InputManager extends SimpleModule
 
     if e.which in @_modifierKeys or e.which in @_arrowKeys
       return
-
-    metaKey = @editor.util.metaKey e
-    $blockEl = @editor.util.closestBlockEl()
-
     # paste shortcut
-    return if metaKey and e.which == 86
-
-    if @editor.util.browser.webkit and e.which == 8 and @editor.selection.rangeAtStartOf $blockEl
-      # fix the span bug in webkit browsers
-      return unless @focused
-      $newBlockEl = @editor.util.closestBlockEl()
-      @editor.selection.save()
-      @editor.formatter.cleanNode $newBlockEl, true
-      @editor.selection.restore()
+    return if @editor.util.metaKey(e) and e.which == 86
 
-    if @editor.util.support.oninput
+    unless @editor.util.support.oninput
       @throttledTrigger 'valuechanged', ['typing']
 
     null