GitHub/butterfly
1
0
Fork 0
mirror of https://github.com/paradoxxxzero/butterfly.git synced 2026-05-26 15:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

term: remove redundant events of inputHelper and redundant contentEditable

Browse Source 
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
This commit is contained in:
Peter Cai
2018-06-03 17:51:16 +08:00
parent 5b9cc257a8
commit 5bbe456496
6 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
butterfly/static/ext.js
View File

@@ -291,9 +291,6 @@
Popup.prototype.open = function(html) {
this.el.innerHTML = html;
this.el.classList.remove('hidden');
if (typeof InstallTrigger !== "undefined") {
document.body.contentEditable = 'false';
}
addEventListener('click', this.bound_click_maybe_close);
return addEventListener('keydown', this.bound_key_maybe_close);
};
@@ -301,9 +298,6 @@
Popup.prototype.close = function() {
removeEventListener('click', this.bound_click_maybe_close);
removeEventListener('keydown', this.bound_key_maybe_close);
if (typeof InstallTrigger !== "undefined") {
document.body.contentEditable = 'true';
}
this.el.classList.add('hidden');
return this.el.innerHTML = '';
};

2
butterfly/static/ext.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
butterfly/static/main.js
View File

@@ -201,8 +201,6 @@
this.inputHelper.addEventListener('compositionstart', this.compositionStart.bind(this));
this.inputHelper.addEventListener('compositionupdate', this.compositionUpdate.bind(this));
this.inputHelper.addEventListener('compositionend', this.compositionEnd.bind(this));
this.inputHelper.addEventListener('keydown', this.keyDown.bind(this));
this.inputHelper.addEventListener('keypress', this.keyPress.bind(this));
addEventListener('keydown', this.keyDown.bind(this));
addEventListener('keypress', this.keyPress.bind(this));
if (!isMobile()) {

4
butterfly/static/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
coffees/ext/popup.coffee
View File

@@ -9,10 +9,6 @@ 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
@@ -20,10 +16,6 @@ class Popup
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 = ''

4
coffees/term.coffee
View File

@@ -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