gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-11 08:05:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix */#.

Browse Source 
--HG--
extra : rebase_source : 6add6d006c1b04e5489968461d09056b3984bb5a
This commit is contained in:
Kris Maglione
2010-09-23 06:34:54 -04:00
parent 06215e2eb9
commit ed38a05313
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/finder.js
View File

@@ -64,11 +64,11 @@ const RangeFinder = Module("rangefinder", {
this.rangeFind.highlighted = highlighted; this.rangeFind.highlighted = highlighted;
this.rangeFind.selections = selections; this.rangeFind.selections = selections;
} }
return str; return this.lastSearchPattern = str;
}, },
find: function (pattern, backwards) { find: function (pattern, backwards) {
let str = this.bootstrap(pattern); let str = this.bootstrap(pattern, backwards);
if (!this.rangeFind.search(str)) if (!this.rangeFind.search(str))
this.timeout(function () { dactyl.echoerr("E486: Pattern not found: " + pattern); }, 0); this.timeout(function () { dactyl.echoerr("E486: Pattern not found: " + pattern); }, 0);
@@ -111,8 +111,6 @@ const RangeFinder = Module("rangefinder", {
this.find(command || this.lastSearchPattern, modes.extended & modes.FIND_BACKWARD); this.find(command || this.lastSearchPattern, modes.extended & modes.FIND_BACKWARD);
} }
this.lastSearchPattern = command;
if (options["hlsearch"]) if (options["hlsearch"])
this.highlight(); this.highlight();
this.rangeFind.focus(); this.rangeFind.focus();
@@ -194,15 +192,15 @@ const RangeFinder = Module("rangefinder", {
mappings.add(myModes.concat([modes.CARET, modes.TEXTAREA]), ["*"], mappings.add(myModes.concat([modes.CARET, modes.TEXTAREA]), ["*"],
"Find word under cursor", "Find word under cursor",
function () { function () {
rangefinder._found = false; rangefinder.find(buffer.getCurrentWord(), false);
rangefinder.onSubmit(buffer.getCurrentWord(), false); rangefinder.findAgain();
}); });
mappings.add(myModes.concat([modes.CARET, modes.TEXTAREA]), ["#"], mappings.add(myModes.concat([modes.CARET, modes.TEXTAREA]), ["#"],
"Find word under cursor backwards", "Find word under cursor backwards",
function () { function () {
rangefinder._found = false; rangefinder.find(buffer.getCurrentWord(), true);
rangefinder.onSubmit(buffer.getCurrentWord(), true); rangefinder.findAgain();
}); });
}, },

2
pentadactyl/TODO
View File

@@ -27,8 +27,6 @@ BUGS:
9 One of the recent completion fixes seems to have broken the caret 9 One of the recent completion fixes seems to have broken the caret
position update. BLOCKER. position update. BLOCKER.
9 about:pentadactyl is currently about:undefined 9 about:pentadactyl is currently about:undefined
9 */# are broken for the upteenth time E.g. * followed by n matches a
previously searched (/) for word not the word matched with *
- visual caret mode is broken, requires a manual page focus first anyway or - visual caret mode is broken, requires a manual page focus first anyway or
else it chucks, I haven't investigated --djk else it chucks, I haven't investigated --djk