term: remove redundant events of inputHelper and redundant contentEdi…

…table We do not need to listen for keydown and keypress for inputHelper because these events will propagate through the parent. Listening them will be redundant and will cause some shortcut key combinations to stop working. Since we now have a hidden `textarea`, there is no longer need to set anything to contentEditable
paradoxxxzero · Jun 3, 2018 · 5bbe456 · 5bbe456
1 parent 5b9cc25
commit 5bbe456
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 23 deletions.
diff --git a/butterfly/static/ext.js b/butterfly/static/ext.js
diff --git a/butterfly/static/ext.min.js b/butterfly/static/ext.min.js
diff --git a/butterfly/static/main.js b/butterfly/static/main.js
diff --git a/butterfly/static/main.min.js b/butterfly/static/main.min.js
diff --git a/coffees/ext/popup.coffee b/coffees/ext/popup.coffee
@@ -9,21 +9,13 @@ class Popup
     @el.innerHTML = html
     @el.classList.remove 'hidden'
 
-    # ff glorious hack
-    if typeof InstallTrigger isnt "undefined"
-      document.body.contentEditable = 'false'
-
     addEventListener 'click', @bound_click_maybe_close
     addEventListener 'keydown', @bound_key_maybe_close
 
   close: ->
     removeEventListener 'click', @bound_click_maybe_close
     removeEventListener 'keydown', @bound_key_maybe_close
 
-    # ff glorious hack
-    if typeof InstallTrigger isnt "undefined"
-      document.body.contentEditable = 'true'
-
     @el.classList.add 'hidden'
     @el.innerHTML = ''
 

diff --git a/coffees/term.coffee b/coffees/term.coffee
@@ -119,10 +119,6 @@ class Terminal
       @compositionUpdate.bind(@)
     @inputHelper.addEventListener 'compositionend',
       @compositionEnd.bind(@)
-    @inputHelper.addEventListener 'keydown',
-      @keyDown.bind(@)
-    @inputHelper.addEventListener 'keypress',
-      @keyPress.bind(@)
     addEventListener 'keydown', @keyDown.bind(@)
     addEventListener 'keypress', @keyPress.bind(@)
     # Always focus on the inputHelper textarea