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

Closes issue #560.

Browse Source
This commit is contained in:
Kris Maglione
2011-07-27 12:49:28 -04:00
parent 9935d93b68
commit deb0cfd5e0
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/content/tabs.js
View File

@@ -45,6 +45,16 @@ var Tabs = Module("tabs", {
if (contentDocument.readyState === "complete") if (contentDocument.readyState === "complete")
dactyl.initDocument(contentDocument); dactyl.initDocument(contentDocument);
}, 1000); }, 1000);
if (window.TabsInTitlebar)
window.TabsInTitlebar.allowedBy("dactyl", false);
},
signals: {
enter: function enter() {
if (window.TabsInTitlebar)
window.TabsInTitlebar.allowedBy("dactyl", true);
}
}, },
_alternates: Class.memoize(function () [config.tabbrowser.mCurrentTab, null]), _alternates: Class.memoize(function () [config.tabbrowser.mCurrentTab, null]),

33
common/modules/finder.jsm
View File

@@ -382,7 +382,7 @@ var RangeFind = Class("RangeFind", {
let doc = range.startContainer.ownerDocument; let doc = range.startContainer.ownerDocument;
let win = doc.defaultView; let win = doc.defaultView;
let ranges = this.ranges.filter(function (r) let ranges = this.ranges.filter(function (r)
r.window === win && RangeFind.contains(r.range, range)); r.window === win && RangeFind.sameDocument(r.range, range) && RangeFind.contains(r.range, range));
if (this.backward) if (this.backward)
return ranges[ranges.length - 1]; return ranges[ranges.length - 1];
@@ -493,7 +493,9 @@ var RangeFind = Class("RangeFind", {
frames.push(r); frames.push(r);
} }
let range = start.startContainer.ownerDocument.createRange(); let doc = start.startContainer.ownerDocument;
let range = doc.createRange();
range.setStart(start.startContainer, start.startOffset); range.setStart(start.startContainer, start.startOffset);
range.setEnd(end.startContainer, end.startOffset); range.setEnd(end.startContainer, end.startOffset);
@@ -505,7 +507,7 @@ var RangeFind = Class("RangeFind", {
} }
function rec(win) { function rec(win) {
let doc = win.document; let doc = win.document;
let pageRange = RangeFind.nodeRange(doc.body || doc.documentElement.lastChild); let pageRange = RangeFind[doc.body ? "nodeRange" : "nodeContents"](doc.body || doc.documentElement);
backup = backup || pageRange; backup = backup || pageRange;
let pageStart = RangeFind.endpoint(pageRange, true); let pageStart = RangeFind.endpoint(pageRange, true);
let pageEnd = RangeFind.endpoint(pageRange, false); let pageEnd = RangeFind.endpoint(pageRange, false);
@@ -520,6 +522,11 @@ var RangeFind = Class("RangeFind", {
} }
} }
pushRange(pageStart, pageEnd); pushRange(pageStart, pageEnd);
for (let [, elem] in iter(doc.getAnonymousNodes(doc.documentElement))) {
let range = RangeFind.nodeContents(elem);
pushRange(RangeFind.endpoint(range, true), RangeFind.endpoint(range, false));
}
} }
rec(win); rec(win);
if (frames.length == 0) if (frames.length == 0)
@@ -737,6 +744,14 @@ var RangeFind = Class("RangeFind", {
return false; return false;
} }
}, },
nodeContents: function (node) {
let range = node.ownerDocument.createRange();
try {
range.selectNodeContents(node);
}
catch (e) {}
return range;
},
nodeRange: function (node) { nodeRange: function (node) {
let range = node.ownerDocument.createRange(); let range = node.ownerDocument.createRange();
try { try {
@@ -745,7 +760,17 @@ var RangeFind = Class("RangeFind", {
catch (e) {} catch (e) {}
return range; return range;
}, },
sameDocument: function (r1, r2) r1 && r2 && r1.endContainer.ownerDocument == r2.endContainer.ownerDocument, sameDocument: function (r1, r2) {
if (!(r1 && r2 && r1.endContainer.ownerDocument == r2.endContainer.ownerDocument))
return false;
try {
r1.compareBoundaryPoints(r1.START_TO_START, r2);
}
catch (e if e.result == 0x80530004 /* NS_ERROR_DOM_WRONG_DOCUMENT_ERR */) {
return false;
}
return true;
},
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(" | ")
}); });