gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 10:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix feedkey mappings on FF36.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-19 23:37:44 -05:00
parent 8142d837c1
commit 8df4e908e8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/events.js
View File

@@ -426,7 +426,7 @@ var Events = Module("events", {
this.feedingEvent = null; this.feedingEvent = null;
} }
} }
: function (target, event, extra) target.dispatchEvent(update(event, extra || {}))), : function (target, event, extra) target.dispatchEvent(event)),
get defaultTarget() dactyl.focusedElement || content.document.body || document.documentElement, get defaultTarget() dactyl.focusedElement || content.document.body || document.documentElement,
@@ -869,7 +869,9 @@ var Events = Module("events", {
} }
if (this.feedingEvent && [!(k in event) || event[k] === v for ([k, v] in Iterator(this.feedingEvent))].every(util.identity)) { if (this.feedingEvent && [!(k in event) || event[k] === v for ([k, v] in Iterator(this.feedingEvent))].every(util.identity)) {
update(event, this.feedingEvent); for (let [k, v] in Iterator(this.feedingEvent))
if (!(k in event))
event[k] = v;
this.feedingEvent = null; this.feedingEvent = null;
} }
@@ -987,7 +989,7 @@ var Events = Module("events", {
res = dactyl.trapErrors(input.fallthrough, input, event); res = dactyl.trapErrors(input.fallthrough, input, event);
} }
if (!keyModes.some(function (m) m.ownsBuffer)) if (!processors.some(function (p) p.main.ownsBuffer))
statusline.updateInputBuffer(buffer); statusline.updateInputBuffer(buffer);
if (waiting) if (waiting)

2
common/content/hints.js
View File

@@ -830,7 +830,7 @@ var Hints = Module("hints", {
context.compare = function () 0; context.compare = function () 0;
context.completions = [[k, v.prompt] for ([k, v] in Iterator(hints._hintModes))]; context.completions = [[k, v.prompt] for ([k, v] in Iterator(hints._hintModes))];
}, },
onAccept: function (arg) { arg && util.timeout(function () hints.show(arg, opts), 0); }, onAccept: function (arg) { arg && util.timeout(function () dactyl.trapErrors(hints.show, hints, arg, opts), 0); },
get onCancel() this.onAccept, get onCancel() this.onAccept,
onChange: function () { modes.pop(); } onChange: function () { modes.pop(); }
}); });