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

Fix issue with ?.

Browse Source
This commit is contained in:
Kris Maglione
2011-04-28 22:27:34 -04:00
parent c4d69376d9
commit c2acfadc85
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/buffer.js
View File

@@ -375,7 +375,7 @@ var Buffer = Module("buffer", {
* @returns {string} * @returns {string}
*/ */
get currentWord() Buffer.currentWord(this.focusedFrame), get currentWord() Buffer.currentWord(this.focusedFrame),
getCurrentWord: deprecated("buffer.currentWord", function getCurrentWord() this.currentWord), getCurrentWord: deprecated("buffer.currentWord", function getCurrentWord() Buffer.currentWord(this.focusedFrame, true)),
/** /**
* Returns true if a scripts are allowed to focus the given input * Returns true if a scripts are allowed to focus the given input
@@ -1088,7 +1088,7 @@ var Buffer = Module("buffer", {
* *
* @returns {string} * @returns {string}
*/ */
currentWord: function currentWord(win) { currentWord: function currentWord(win, select) {
let selection = win.getSelection(); let selection = win.getSelection();
if (selection.rangeCount == 0) if (selection.rangeCount == 0)
return ""; return "";
@@ -1099,6 +1099,10 @@ var Buffer = Module("buffer", {
Editor.extendRange(range, true, re, true); Editor.extendRange(range, true, re, true);
Editor.extendRange(range, false, re, true); Editor.extendRange(range, false, re, true);
} }
if (select) {
selection.removeAllRanges();
selection.addRange(range);
}
return util.domToString(range); return util.domToString(range);
}, },

11
common/modules/finder.jsm
View File

@@ -41,10 +41,13 @@ var RangeFinder = Module("rangefinder", {
if (this.rangeFind && equals(this.rangeFind.window.get(), this.window)) if (this.rangeFind && equals(this.rangeFind.window.get(), this.window))
this.rangeFind.reset(); this.rangeFind.reset();
this.find("", mode === this.modes.FIND_BACKWARD); this.find("", mode == this.modes.FIND_BACKWARD);
}, },
bootstrap: function (str, backward) { bootstrap: function (str, backward) {
if (arguments.length < 2 && this.rangeFind)
backward = this.rangeFind.reverse;
let highlighted = this.rangeFind && this.rangeFind.highlighted; let highlighted = this.rangeFind && this.rangeFind.highlighted;
let selections = this.rangeFind && this.rangeFind.selections; let selections = this.rangeFind && this.rangeFind.selections;
let linksOnly = false; let linksOnly = false;
@@ -209,7 +212,7 @@ var RangeFinder = Module("rangefinder", {
}); });
}, },
mappings: function (dactyl, modules, window) { mappings: function (dactyl, modules, window) {
const { buffer, config, mappings, modes, rangefinder } = modules; const { Buffer, 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,
@@ -231,14 +234,14 @@ var RangeFinder = Module("rangefinder", {
mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["*"], mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["*"],
"Find word under cursor", "Find word under cursor",
function () { function () {
rangefinder.find(buffer.getCurrentWord(), false); rangefinder.find(Buffer.currentWord(buffer.focusedFrame, true), false);
rangefinder.findAgain(); rangefinder.findAgain();
}); });
mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["#"], mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["#"],
"Find word under cursor backwards", "Find word under cursor backwards",
function () { function () {
rangefinder.find(buffer.getCurrentWord(), true); rangefinder.find(Buffer.currentWord(buffer.focusedFrame, true), true);
rangefinder.findAgain(); rangefinder.findAgain();
}); });