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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/about.xul
View File

@@ -20,7 +20,7 @@ by Kris Maglione, Doug Kearns, et al.
&dactyl.appName; is open source and freely distributable
type :q&lt;<span class="key">Enter</span>> to exit <!---->
type :help&lt;<span class="key">Enter</span>> or &lt;<span class="key">F1</span>> for on-line help
type :help&lt;<span class="key">Enter</span>> for on-line help
type :help faq&lt;<span class="key">Enter</span>> for the FAQ page
type :help versions&lt;<span class="key">Enter</span>> for version info
</div>

2
common/content/commandline.js
View File

@@ -2291,7 +2291,7 @@ var ItemList = Class("ItemList", {
DOM(this.nodes.message).empty()
.append(DOM.fromJSON(this.context.message, this.doc));
if (!this.selectedIdx > this.itemCount)
if (this.selectedIdx > this.itemCount)
this.selectedIdx = null;
},

10
common/content/events.js
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

4
common/content/key-processors.js
View File

@@ -159,7 +159,7 @@ var ProcessorStack = Class("ProcessorStack", {
if (this.timer)
this.timer.cancel();
let key = DOM.Event.stringify(event);
let key = event.dactylString || DOM.Event.stringify(event);
this.events.push(event);
if (this.keyEvents)
this.keyEvents.push(event);
@@ -233,7 +233,7 @@ var KeyProcessor = Class("KeyProcessor", {
append: function append(event) {
this.events.push(event);
let key = DOM.Event.stringify(event);
let key = event.dactylString || DOM.Event.stringify(event);
if (this.wantCount && !this.command &&
(this.countStr ? /^[0-9]$/ : /^[1-9]$/).test(key))