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

Fix rangefinder search history issue.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-12 12:18:26 -05:00
parent 71d9a51442
commit 9ba3635bc1
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/commandline.js
View File

@@ -399,14 +399,13 @@ var CommandMode = Class("CommandMode", {
return true; /* Pass event */ return true; /* Pass event */
}, },
onCancel: function (value) { onCancel: function (value) {},
},
onChange: function (value) { onChange: function (value) {},
},
onSubmit: function (value) { onHistory: function (value) {},
},
onSubmit: function (value) {},
resetCompletions: function resetCompletions() { resetCompletions: function resetCompletions() {
if (this.completions) { if (this.completions) {
@@ -941,6 +940,7 @@ var CommandLine = Module("commandline", {
if (this.completions) if (this.completions)
this.completions.previewClear(); this.completions.previewClear();
this.input.value = val; this.input.value = val;
this.session.onHistory(val);
}, },
/** /**

2
common/content/dactyl.js
View File

@@ -346,7 +346,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
echoerr: function echoerr(str, flags) { echoerr: function echoerr(str, flags) {
flags |= commandline.APPEND_TO_MESSAGES; flags |= commandline.APPEND_TO_MESSAGES;
if (isinstance(str, ["Error", "Exception"]) || isinstance(str, [XPCWrappedNative_NoHelper]) && /^\[Exception/.test(str)) if (isinstance(str, ["Error", "Exception"]) || isinstance(str, ["XPCWrappedNative_NoHelper"]) && /^\[Exception/.test(str))
dactyl.reportError(str); dactyl.reportError(str);
if (isObject(str) && "echoerr" in str) if (isObject(str) && "echoerr" in str)
str = str.echoerr; str = str.echoerr;

11
common/content/events.js
View File

@@ -103,10 +103,6 @@ var ProcessorStack = Class("ProcessorStack", {
events.dbg("RESULT: " + length + " " + this._result(result)); events.dbg("RESULT: " + length + " " + this._result(result));
if (result === Events.PASS || result === Events.PASS_THROUGH)
if (this.events[0].originalTarget)
this.events[0].originalTarget.dactylKeyPress = undefined;
if (result !== Events.PASS || this.events.length > 1) if (result !== Events.PASS || this.events.length > 1)
if (result !== Events.ABORT || !this.events[0].isReplay) if (result !== Events.ABORT || !this.events[0].isReplay)
Events.kill(this.events[this.events.length - 1]); Events.kill(this.events[this.events.length - 1]);
@@ -327,6 +323,9 @@ var EventHive = Class("EventHive", Contexts.Hive, {
[,, capture, allowUntrusted] = arguments; [,, capture, allowUntrusted] = arguments;
} }
if (set.has(events, "input") && !set.has(events, "dactyl-input"))
events["dactyl-input"] = events.input;
for (let [event, callback] in Iterator(events)) { for (let [event, callback] in Iterator(events)) {
let args = [Cu.getWeakReference(target), let args = [Cu.getWeakReference(target),
event, event,
@@ -731,7 +730,7 @@ var Events = Module("events", {
} }
}; };
const TYPES = { const TYPES = {
change: "", input: "", submit: "", change: "", "dactyl-input": "", input: "", submit: "",
click: "Mouse", mousedown: "Mouse", mouseup: "Mouse", click: "Mouse", mousedown: "Mouse", mouseup: "Mouse",
mouseover: "Mouse", mouseout: "Mouse", mouseover: "Mouse", mouseout: "Mouse",
keypress: "Key", keyup: "Key", keydown: "Key" keypress: "Key", keyup: "Key", keydown: "Key"
@@ -1199,7 +1198,7 @@ var Events = Module("events", {
elem.dactylKeyPress = elem.value; elem.dactylKeyPress = elem.value;
util.timeout(function () { util.timeout(function () {
if (elem.dactylKeyPress !== undefined && elem.value !== elem.dactylKeyPress) if (elem.dactylKeyPress !== undefined && elem.value !== elem.dactylKeyPress)
events.dispatch(elem, events.create(elem.ownerDocument, "input")); events.dispatch(elem, events.create(elem.ownerDocument, "dactyl-input"));
elem.dactylKeyPress = undefined; elem.dactylKeyPress = undefined;
}); });
} }

5
common/modules/finder.jsm
View File

@@ -132,6 +132,10 @@ var RangeFinder = Module("rangefinder", {
} }
}, },
onHistory: function () {
this.rangeFind.found = false;
},
onSubmit: function (command) { onSubmit: function (command) {
if (!this.options["incfind"] || !this.rangeFind || !this.rangeFind.found) { if (!this.options["incfind"] || !this.rangeFind || !this.rangeFind.found) {
this.clear(); this.clear();
@@ -200,6 +204,7 @@ var RangeFinder = Module("rangefinder", {
get onCancel() modules.rangefinder.closure.onCancel, get onCancel() modules.rangefinder.closure.onCancel,
get onChange() modules.rangefinder.closure.onChange, get onChange() modules.rangefinder.closure.onChange,
get onHistory() modules.rangefinder.closure.onHistory,
get onSubmit() modules.rangefinder.closure.onSubmit get onSubmit() modules.rangefinder.closure.onSubmit
}); });
}, },