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

Fix some age old hint bugs, including iframed hint viewport calculations.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-12 15:26:04 -04:00
parent 4351bb675b
commit 1a10353f43
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
common/content/hints.js
View File

@@ -259,15 +259,33 @@ const Hints = Module("hints", {
* @param {Window} win The window for which to generate hints. * @param {Window} win The window for which to generate hints.
* @default window.content * @default window.content
*/ */
_generate: function _generate(win) { _generate: function _generate(win, offsets) {
if (!win) if (!win)
win = this._top; win = this._top;
let doc = win.document; let doc = win.document;
let height = win.innerHeight; if (!doc.body && !doc.document)
let width = win.innerWidth; return;
let [offsetX, offsetY] = this._getContainerOffsets(doc); let [offsetX, offsetY] = this._getContainerOffsets(doc);
offsets = offsets || { left: 0, right: 0, top: 0, bottom: 0 };
offsets.right = win.innerWidth - offsets.right;
offsets.bottom = win.innerHeight - offsets.bottom;
function isVisible(elem) {
let rect = elem.getBoundingClientRect();
if (!rect || !rect.width || !rect.height ||
rect.top > offsets.bottom || rect.bottom < offsets.top ||
rect.left > offsets.right || rect.right < offsets.left)
return false;
let computedStyle = doc.defaultView.getComputedStyle(elem, null);
if (computedStyle.visibility != "visible" || computedStyle.display == "none")
return false;
return true;
}
let baseNodeAbsolute = util.xmlToDom(<span highlight="Hint"/>, doc); let baseNodeAbsolute = util.xmlToDom(<span highlight="Hint"/>, doc);
let res = util.evaluateXPath(this._hintMode.xpath, doc, null, true); let res = util.evaluateXPath(this._hintMode.xpath, doc, null, true);
@@ -277,13 +295,7 @@ const Hints = Module("hints", {
for (let elem in res) { for (let elem in res) {
let hint = { elem: elem, showText: false }; let hint = { elem: elem, showText: false };
// TODO: for iframes, this calculation is wrong if (!isVisible(elem))
let rect = elem.getBoundingClientRect();
if (!rect || !rect.width || !rect.height || rect.top > height || rect.bottom < 0 || rect.left > width || rect.right < 0)
continue;
let computedStyle = doc.defaultView.getComputedStyle(elem, null);
if (computedStyle.visibility != "visible" || computedStyle.display == "none")
continue; continue;
if (isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement])) if (isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement]))
@@ -293,7 +305,7 @@ const Hints = Module("hints", {
hint.span = baseNodeAbsolute.cloneNode(true); hint.span = baseNodeAbsolute.cloneNode(true);
rect = elem.getClientRects()[0] || rect; let rect = elem.getClientRects()[0] || elem.getBoundingClientRect();
let leftPos = Math.max((rect.left + offsetX), offsetX); let leftPos = Math.max((rect.left + offsetX), offsetX);
let topPos = Math.max((rect.top + offsetY), offsetY); let topPos = Math.max((rect.top + offsetY), offsetY);
@@ -313,8 +325,17 @@ const Hints = Module("hints", {
this._docs.push({ doc: doc, start: start, end: this._pageHints.length - 1 }); this._docs.push({ doc: doc, start: start, end: this._pageHints.length - 1 });
} }
// also _generate hints for frames Array.forEach(win.frames, function (f) {
Array.forEach(win.frames, this.closure._generate); if (isVisible(f.frameElement)) {
let rect = f.frameElement.getBoundingClientRect();
this._generate(f, {
left: Math.max(offsets.left - rect.left, 0),
right: Math.max(rect.right - offsets.right, 0),
top: Math.max(offsets.top - rect.top, 0),
bottom: Math.max(rect.bottom - offsets.bottom, 0)
});
}
}, this);
return true; return true;
}, },