rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for hinting elements from within same-origin frames

Browse Source
This commit is contained in:
Jay Kamat 2017-12-06 22:37:00 -05:00
parent ce46b30a1e
commit d4001a4a98
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
qutebrowser/javascript/webelem.js
View File

@ -40,7 +40,7 @@ window._qutebrowser.webelem = (function() {
const funcs = {};
const elements = [];
function serialize_elem(elem) {
function serialize_elem(elem, frame = null) {
if (!elem) {
return null;
}
@ -55,7 +55,7 @@ window._qutebrowser.webelem = (function() {
try {
caret_position = elem.selectionStart;
} catch (err) {
if (err instanceof DOMException &&
if (err.constructor.name === "DOMException" &&
err.name === "InvalidStateError") {
// nothing to do, caret_position is already null
} else {
@ -102,15 +102,25 @@ window._qutebrowser.webelem = (function() {
out.attributes = attributes;
const client_rects = elem.getClientRects();
// Get location of frame and add it to element
// TODO How to generate a 0 object without this
let frame_offset_rect = null;
if (frame === null) {
frame_offset_rect = document.head.getBoundingClientRect();
} else {
frame_offset_rect = frame.getBoundingClientRect();
}
for (let k = 0; k < client_rects.length; ++k) {
const rect = client_rects[k];
out.rects.push({
"top": rect.top,
"right": rect.right,
"bottom": rect.bottom,
"left": rect.left,
"height": rect.height,
"width": rect.width,
"top": rect.top + frame_offset_rect.top,
"right": rect.right + frame_offset_rect.right,
"bottom": rect.bottom + frame_offset_rect.bottom,
"left": rect.left + frame_offset_rect.left,
"height": rect.height + frame_offset_rect.height,
"width": rect.width + frame_offset_rect.width,
});
}
@ -163,6 +173,7 @@ window._qutebrowser.webelem = (function() {
funcs.find_css = (selector, only_visible) => {
const elems = document.querySelectorAll(selector);
const subelem_frames = window.frames;
const out = [];
for (let i = 0; i < elems.length; ++i) {
@ -171,6 +182,25 @@ window._qutebrowser.webelem = (function() {
}
}
// Recurse into frames and add them
for (let i = 0; i < subelem_frames.length; i++) {
try {
subelem_frames[i].document;
} catch (err) {
// If we have a cross-origin frame, skip it.
continue;
}
const subelems = subelem_frames[i].document.
querySelectorAll(selector);
const frame = subelem_frames[i].frameElement;
for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
if (!only_visible || is_visible(subelems[elem_num])) {
out.push(serialize_elem(subelems[elem_num], frame));
}
}
}
return out;
};

2
tests/end2end/features/hints.feature
View File

@ -204,8 +204,6 @@ Feature: Using hints
Then the javascript message "contents: existingnew" should be logged
### iframes
@qtwebengine_todo: Hinting in iframes is not implemented yet
Scenario: Using :follow-hint inside an iframe
When I open data/hints/iframe.html
And I hint with args "links normal" and follow a