1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-12 06:35:47 +01:00

Fix more cross-compartment expando breakage. Also, Die <F1>! Die, die, die!

This commit is contained in:
Kris Maglione
2012-12-20 18:47:32 -08:00
parent 2ec3cb0a46
commit d0e53df525
7 changed files with 17 additions and 27 deletions

View File

@@ -661,13 +661,15 @@ var Events = Module("events", {
let duringFeed = this.duringFeed || [];
this.duringFeed = [];
try {
if (DOM.Event.feedingEvent)
for (let [k, v] in Iterator(DOM.Event.feedingEvent))
let ourEvent = DOM.Event.feedingEvent;
DOM.Event.feedingEvent = null;
if (ourEvent)
for (let [k, v] in Iterator(ourEvent))
if (!(k in event))
event[k] = v;
DOM.Event.feedingEvent = null;
let key = DOM.Event.stringify(event);
let key = DOM.Event.stringify(ourEvent || event);
event.dactylString = key;
// Hack to deal with <BS> and so forth not dispatching input
// events