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

Experimentally move finder.js to finder.jsm.

Browse Source 
--HG--
rename : common/content/finder.js => common/modules/finder.jsm
This commit is contained in:
Kris Maglione
2011-01-04 02:20:52 -05:00
parent 8e498ed52f
commit 27f5f16aa9
3 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/buffer.js
View File

@@ -8,8 +8,6 @@
/** @scope modules */ /** @scope modules */
var Point = Struct("x", "y");
/** /**
* A class to manage the primary web content buffer. The name comes * A class to manage the primary web content buffer. The name comes
* from Vim's term, 'buffer', which signifies instances of open * from Vim's term, 'buffer', which signifies instances of open

112
common/content/finder.js → common/modules/finder.jsm
View File

@@ -4,19 +4,33 @@
// given in the LICENSE.txt file included with this file. // given in the LICENSE.txt file included with this file.
"use strict"; "use strict";
/** @scope modules */ Components.utils.import("resource://dactyl/base.jsm");
defineModule("finder", {
exports: ["RangeFind", "RangeFinder", "rangefinder"],
use: ["prefs", "services", "util"]
});
/** @instance rangefinder */ /** @instance rangefinder */
var RangeFinder = Module("rangefinder", { var RangeFinder = Module("rangefinder", {
init: function () { Local: function (dactyl, modules, window) ({
this.lastFindPattern = ""; init: function () {
}, this.dactyl = dactyl;
this.commandline = modules.commandline;
this.modes = modules.modes;
this.window = window;
this.options = modules.options;
this.lastFindPattern = "";
},
get rangeFind() modules.buffer.localStore.rangeFind,
set rangeFind(val) modules.buffer.localStore.rangeFind = val
}),
openPrompt: function (mode) { openPrompt: function (mode) {
let backwards = mode == modes.FIND_BACKWARD; let backwards = mode == this.modes.FIND_BACKWARD;
commandline.open(backwards ? "?" : "/", "", mode); this.commandline.open(backwards ? "?" : "/", "", mode);
if (this.rangeFind && this.rangeFind.window.get() === window) if (this.rangeFind && this.rangeFind.window.get() === this.window)
this.rangeFind.reset(); this.rangeFind.reset();
this.find("", backwards); this.find("", backwards);
}, },
@@ -29,8 +43,8 @@ var RangeFinder = Module("rangefinder", {
let selections = this.rangeFind && this.rangeFind.selections; let selections = this.rangeFind && this.rangeFind.selections;
let linksOnly = false; let linksOnly = false;
let regexp = false; let regexp = false;
let matchCase = options["findcase"] === "smart" ? /[A-Z]/.test(str) : let matchCase = this.options["findcase"] === "smart" ? /[A-Z]/.test(str) :
options["findcase"] === "ignore" ? false : true; this.options["findcase"] === "ignore" ? false : true;
str = str.replace(/\\(.|$)/g, function (m, n1) { str = str.replace(/\\(.|$)/g, function (m, n1) {
if (n1 == "c") if (n1 == "c")
@@ -53,7 +67,7 @@ var RangeFinder = Module("rangefinder", {
// It's possible, with :tabdetach for instance, for the rangeFind to // It's possible, with :tabdetach for instance, for the rangeFind to
// actually move from one window to another, which breaks things. // actually move from one window to another, which breaks things.
if (!this.rangeFind if (!this.rangeFind
|| this.rangeFind.window.get() != window || this.rangeFind.window.get() != this.window
|| linksOnly != !!this.rangeFind.elementPath || linksOnly != !!this.rangeFind.elementPath
|| regexp != this.rangeFind.regexp || regexp != this.rangeFind.regexp
|| matchCase != this.rangeFind.matchCase || matchCase != this.rangeFind.matchCase
@@ -61,7 +75,9 @@ var RangeFinder = Module("rangefinder", {
if (this.rangeFind) if (this.rangeFind)
this.rangeFind.cancel(); this.rangeFind.cancel();
this.rangeFind = RangeFind(matchCase, backward, linksOnly && options["hinttags"], regexp); this.rangeFind = RangeFind(this.window, matchCase, backward,
linksOnly && this.options["hinttags"],
regexp);
this.rangeFind.highlighted = highlighted; this.rangeFind.highlighted = highlighted;
this.rangeFind.selections = selections; this.rangeFind.selections = selections;
} }
@@ -71,7 +87,7 @@ var RangeFinder = Module("rangefinder", {
find: function (pattern, backwards) { find: function (pattern, backwards) {
let str = this.bootstrap(pattern, backwards); let str = this.bootstrap(pattern, backwards);
if (!this.rangeFind.find(str)) if (!this.rangeFind.find(str))
this.timeout(function () { dactyl.echoerr("E486: Pattern not found: " + pattern); }, 0); this.timeout(function () { this.dactyl.echoerr("E486: Pattern not found: " + pattern); }, 0);
return this.rangeFind.found; return this.rangeFind.found;
}, },
@@ -80,39 +96,39 @@ var RangeFinder = Module("rangefinder", {
if (!this.rangeFind || this.rangeFind.stale) if (!this.rangeFind || this.rangeFind.stale)
this.find(this.lastFindPattern); this.find(this.lastFindPattern);
else if (!this.rangeFind.find(null, reverse)) else if (!this.rangeFind.find(null, reverse))
dactyl.echoerr("E486: Pattern not found: " + this.lastFindPattern); this.dactyl.echoerr("E486: Pattern not found: " + this.lastFindPattern);
else if (this.rangeFind.wrapped) else if (this.rangeFind.wrapped)
// hack needed, because wrapping causes a "scroll" event which // hack needed, because wrapping causes a "scroll" event which
// clears our command line // clears our command line
this.timeout(function () { this.timeout(function () {
let msg = this.rangeFind.backward ? "find hit TOP, continuing at BOTTOM" let msg = this.rangeFind.backward ? "find hit TOP, continuing at BOTTOM"
: "find hit BOTTOM, continuing at TOP"; : "find hit BOTTOM, continuing at TOP";
commandline.echo(msg, commandline.HL_WARNINGMSG, this.commandline.echo(msg, "Warning", this.commandline.APPEND_TO_MESSAGES
commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE); | this.commandline.FORCE_SINGLELINE);
}, 0); }, 0);
else else
commandline.echo((this.rangeFind.backward ? "?" : "/") + this.lastFindPattern, null, commandline.FORCE_SINGLELINE); this.commandline.widgets.message = ["Normal", (this.rangeFind.backward ? "?" : "/") + this.lastFindPattern];
if (options["hlfind"]) if (this.options["hlfind"])
this.highlight(); this.highlight();
this.rangeFind.focus(); this.rangeFind.focus();
}, },
// Called when the user types a key in the find dialog. Triggers a find attempt if 'incfind' is set // Called when the user types a key in the find dialog. Triggers a find attempt if 'incfind' is set
onKeyPress: function (command) { onKeyPress: function (command) {
if (options["incfind"]) { if (this.options["incfind"]) {
command = this.bootstrap(command); command = this.bootstrap(command);
this.rangeFind.find(command); this.rangeFind.find(command);
} }
}, },
onSubmit: function (command) { onSubmit: function (command) {
if (!options["incfind"] || !this.rangeFind || !this.rangeFind.found) { if (!this.options["incfind"] || !this.rangeFind || !this.rangeFind.found) {
this.clear(); this.clear();
this.find(command || this.lastFindPattern, modes.extended & modes.FIND_BACKWARD); this.find(command || this.lastFindPattern, this.modes.extended & this.modes.FIND_BACKWARD);
} }
if (options["hlfind"]) if (this.options["hlfind"])
this.highlight(); this.highlight();
this.rangeFind.focus(); this.rangeFind.focus();
}, },
@@ -124,9 +140,6 @@ var RangeFinder = Module("rangefinder", {
this.rangeFind.cancel(); this.rangeFind.cancel();
}, },
get rangeFind() buffer.localStore.rangeFind,
set rangeFind(val) buffer.localStore.rangeFind = val,
/** /**
* Highlights all occurrences of the last finded for string in the * Highlights all occurrences of the last finded for string in the
* current buffer. * current buffer.
@@ -145,7 +158,8 @@ var RangeFinder = Module("rangefinder", {
} }
}, { }, {
}, { }, {
modes: function () { modes: function (dactyl, modules, window) {
const { modes } = modules;
/* Must come before commandline. */ /* Must come before commandline. */
modes.addMode("FIND_FORWARD", { modes.addMode("FIND_FORWARD", {
extended: true, extended: true,
@@ -156,21 +170,24 @@ var RangeFinder = Module("rangefinder", {
description: "Backward Find mode, active when typing search input" description: "Backward Find mode, active when typing search input"
}); });
}, },
commandline: function () { commandline: function (dactyl, modules, window) {
commandline.registerCallback("change", modes.FIND_FORWARD, this.closure.onKeyPress); const { commandline, modes, rangefinder } = modules;
commandline.registerCallback("submit", modes.FIND_FORWARD, this.closure.onSubmit); commandline.registerCallback("change", modes.FIND_FORWARD, rangefinder.closure.onKeyPress);
commandline.registerCallback("cancel", modes.FIND_FORWARD, this.closure.onCancel); commandline.registerCallback("submit", modes.FIND_FORWARD, rangefinder.closure.onSubmit);
commandline.registerCallback("change", modes.FIND_BACKWARD, this.closure.onKeyPress); commandline.registerCallback("cancel", modes.FIND_FORWARD, rangefinder.closure.onCancel);
commandline.registerCallback("submit", modes.FIND_BACKWARD, this.closure.onSubmit); commandline.registerCallback("change", modes.FIND_BACKWARD, rangefinder.closure.onKeyPress);
commandline.registerCallback("cancel", modes.FIND_BACKWARD, this.closure.onCancel); commandline.registerCallback("submit", modes.FIND_BACKWARD, rangefinder.closure.onSubmit);
commandline.registerCallback("cancel", modes.FIND_BACKWARD, rangefinder.closure.onCancel);
}, },
commands: function () { commands: function (dactyl, modules, window) {
const { commands, rangefinder } = modules;
commands.add(["noh[lfind]"], commands.add(["noh[lfind]"],
"Remove the find highlighting", "Remove the find highlighting",
function () { rangefinder.clear(); }, function () { rangefinder.clear(); },
{ argCount: "0" }); { argCount: "0" });
}, },
mappings: function () { mappings: function (dactyl, modules, window) {
const { buffer, config, mappings, modes, rangefinder } = modules;
var myModes = config.browserModes.concat([modes.CARET]); var myModes = config.browserModes.concat([modes.CARET]);
mappings.add(myModes, mappings.add(myModes,
@@ -204,7 +221,8 @@ var RangeFinder = Module("rangefinder", {
}); });
}, },
options: function () { options: function (dactyl, modules, window) {
const { options, rangefinder } = modules;
// prefs.safeSet("accessibility.typeaheadfind.autostart", false); // prefs.safeSet("accessibility.typeaheadfind.autostart", false);
// The above should be sufficient, but: https://bugzilla.mozilla.org/show_bug.cgi?id=348187 // The above should be sufficient, but: https://bugzilla.mozilla.org/show_bug.cgi?id=348187
prefs.safeSet("accessibility.typeaheadfind", false); prefs.safeSet("accessibility.typeaheadfind", false);
@@ -258,9 +276,11 @@ var RangeFinder = Module("rangefinder", {
* large amounts of data are concerned (e.g., for API documents). * large amounts of data are concerned (e.g., for API documents).
*/ */
var RangeFind = Class("RangeFind", { var RangeFind = Class("RangeFind", {
init: function (matchCase, backward, elementPath, regexp) { init: function (window, matchCase, backward, elementPath, regexp) {
this.window = Cu.getWeakReference(window); this.window = Cu.getWeakReference(window);
this.baseDocument = Cu.getWeakReference(content.document); this.content = window.content;
this.baseDocument = Cu.getWeakReference(this.content.document);
this.elementPath = elementPath || null; this.elementPath = elementPath || null;
this.reverse = Boolean(backward); this.reverse = Boolean(backward);
@@ -268,7 +288,7 @@ var RangeFind = Class("RangeFind", {
this.matchCase = Boolean(matchCase); this.matchCase = Boolean(matchCase);
this.regexp = Boolean(regexp); this.regexp = Boolean(regexp);
this.ranges = this.makeFrameList(content); this.ranges = this.makeFrameList(this.content);
this.reset(); this.reset();
@@ -295,7 +315,11 @@ var RangeFind = Class("RangeFind", {
get findString() this.lastString, get findString() this.lastString,
get selectedRange() { get selectedRange() {
let selection = (buffer.focusedFrame || content).getSelection(); let win = this.content, store = this.content.document.dactylStore;;
if (store)
win = store.focusedFrame || win;
let selection = win.getSelection();
return (selection.rangeCount ? selection.getRangeAt(0) : this.ranges[0].range).cloneRange(); return (selection.rangeCount ? selection.getRangeAt(0) : this.ranges[0].range).cloneRange();
}, },
set selectedRange(range) { set selectedRange(range) {
@@ -347,7 +371,7 @@ var RangeFind = Class("RangeFind", {
var node = util.evaluateXPath(RangeFind.selectNodePath, this.range.document, var node = util.evaluateXPath(RangeFind.selectNodePath, this.range.document,
this.lastRange.commonAncestorContainer).snapshotItem(0); this.lastRange.commonAncestorContainer).snapshotItem(0);
if (node) { if (node) {
dactyl.focus(node); node.focus()
// Re-highlight collapsed selection // Re-highlight collapsed selection
this.selectedRange = this.lastRange; this.selectedRange = this.lastRange;
} }
@@ -576,7 +600,7 @@ var RangeFind = Class("RangeFind", {
return range; return range;
}, },
get stale() this._stale || this.baseDocument.get() != content.document, get stale() this._stale || this.baseDocument.get() != this.content.document,
set stale(val) this._stale = val, set stale(val) this._stale = val,
addListeners: function () { addListeners: function () {
@@ -653,7 +677,7 @@ var RangeFind = Class("RangeFind", {
range.compareBoundaryPoints(range.END_TO_START, r) <= 0; range.compareBoundaryPoints(range.END_TO_START, r) <= 0;
} }
catch (e) { catch (e) {
dactyl.reportError(e, true); util.reportError(e, true);
return false; return false;
} }
}, },
@@ -663,7 +687,7 @@ var RangeFind = Class("RangeFind", {
r.compareBoundaryPoints(range.END_TO_START, range) <= 0; r.compareBoundaryPoints(range.END_TO_START, range) <= 0;
} }
catch (e) { catch (e) {
dactyl.reportError(e, true); util.reportError(e, true);
return false; return false;
} }
}, },
@@ -689,4 +713,6 @@ var RangeFind = Class("RangeFind", {
selectNodePath: ["a", "xhtml:a", "*[@onclick]"].map(function (p) "ancestor-or-self::" + p).join(" | ") selectNodePath: ["a", "xhtml:a", "*[@onclick]"].map(function (p) "ancestor-or-self::" + p).join(" | ")
}); });
endModule();
// vim: set fdm=marker sw=4 ts=4 et: // vim: set fdm=marker sw=4 ts=4 et:

3
common/modules/util.jsm
View File

@@ -10,7 +10,7 @@ try {
Components.utils.import("resource://dactyl/base.jsm"); Components.utils.import("resource://dactyl/base.jsm");
defineModule("util", { defineModule("util", {
exports: ["FailedAssertion", "Math", "NS", "Util", "XBL", "XHTML", "XUL", "util"], exports: ["FailedAssertion", "Math", "NS", "Point", "Util", "XBL", "XHTML", "XUL", "util"],
require: ["services"], require: ["services"],
use: ["config", "highlight", "storage", "template"] use: ["config", "highlight", "storage", "template"]
}); });
@@ -29,6 +29,7 @@ memoize(this, "Commands", function () {
}); });
var FailedAssertion = Class("FailedAssertion", ErrorBase); var FailedAssertion = Class("FailedAssertion", ErrorBase);
var Point = Struct("x", "y");
function wrapCallback(fn) function wrapCallback(fn)
fn.wrapper = function wrappedCallback () { fn.wrapper = function wrappedCallback () {