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

Fix finding from caret.

Browse Source 
--HG--
branch : testing
This commit is contained in:
Kris Maglione
2010-06-10 01:30:03 -04:00
parent a14e5127df
commit 535293a53e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/finder.js
View File

@@ -270,8 +270,7 @@ const RangeFind = Class("RangeFind", {
get selectedRange() { get selectedRange() {
let range = RangeFind.Range(tabs.localStore.focusedFrame || content); let range = RangeFind.Range(tabs.localStore.focusedFrame || content);
range = (range.selection.rangeCount ? range.selection.getRangeAt(0) : this.ranges[0].range).cloneRange(); return (range.selection.rangeCount ? range.selection.getRangeAt(0) : this.ranges[0].range).cloneRange();
return range;
}, },
reset: function () { reset: function () {
@@ -411,6 +410,9 @@ const RangeFind = Class("RangeFind", {
}, },
search: function (word, reverse, private_) { search: function (word, reverse, private_) {
if (!private_ && this.lastRange && !RangeFind.equal(this.selectedRange, this.lastRange))
this.reset();
this.wrapped = false; this.wrapped = false;
this.finder.findBackwards = reverse ? !this.reverse : this.reverse; this.finder.findBackwards = reverse ? !this.reverse : this.reverse;
let again = word == null; let again = word == null;
@@ -426,8 +428,6 @@ const RangeFind = Class("RangeFind", {
this.range.descroll(); this.range.descroll();
this.lastRange = this.startRange; this.lastRange = this.startRange;
this.range = this.ranges.first; this.range = this.ranges.first;
} else if (!private_ && this.lastRange && !RangeFind.equal(this.selectedRange, this.lastRange)) {
this.reset();
} }
if (word == "") if (word == "")