Skip to content

Commit 5b72307

Browse files
committed
Merge branch 'master' into obey-close-window-config
2 parents ad1fba8 + 7d3849e commit 5b72307

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

common/content/events.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,12 +1098,22 @@ const Events = Module("events", {
10981098

10991099
onKeyUpOrDown: function (event) {
11001100
// Always let the event be handled by the webpage/Firefox for certain modes
1101-
if (modes.passNextKey || modes.passAllKeys || modes.isMenuShown || Events.isInputElemFocused())
1101+
if (modes.passNextKey || modes.isMenuShown || Events.isInputElemFocused())
11021102
return;
11031103

1104+
let key = events.toString(event);
1105+
if (modes.passAllKeys) {
1106+
// Respect "unignored" keys
1107+
if (modes._passKeysExceptions == null || modes._passKeysExceptions.indexOf(key) < 0) {
1108+
return;
1109+
} else {
1110+
event.stopPropagation();
1111+
return;
1112+
}
1113+
}
1114+
11041115
// Many sites perform (useful) actions on keydown.
11051116
// Let's keep the most common ones unless we have a mapping for that
1106-
let key = events.toString(event);
11071117
if (event.type == "keydown" && this.isEscapeKey(key)) {
11081118
this.onEscape(); // We do our Escape handling here, as the on "onKeyPress" may not always work if websites override the keydown event
11091119
event.stopPropagation();

common/skin/liberator.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@
228228
#content-frame, #appcontent {
229229
border: 0px;
230230
}
231+
232+
#liberator-commandline-command .textbox-search-icons {
233+
display: none !important;
234+
}
231235
}
232236

233237
/* vim: set fdm=marker sw=4 ts=4 et: */

vimperator/NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
201x-xx-xx:
2+
* Stop propagation for keyboard event if that key are contained in -except option on :ignorekeys
23

34
2015-08-25:
45
* Version 3.10.1

0 commit comments

Comments
 (0)