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

Merge remote-tracking branch 'origin/pr/3624'

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-25 21:09:56 +01:00
commit 54713f57e5
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/javascript/webelem.js
View File

@ -331,13 +331,13 @@ window._qutebrowser.webelem = (function() {
// Function for returning a selection to python (so we can click it) // Function for returning a selection to python (so we can click it)
funcs.find_selected_link = () => { funcs.find_selected_link = () => {
const elem = window.getSelection().anchorNode; const elem = window.getSelection().baseNode;
if (elem) { if (elem) {
return serialize_elem(elem.parentNode); return serialize_elem(elem.parentNode);
} }
const serialized_frame_elem = run_frames((frame) => { const serialized_frame_elem = run_frames((frame) => {
const node = frame.window.getSelection().anchorNode; const node = frame.window.getSelection().baseNode;
if (node) { if (node) {
return serialize_elem(node.parentNode, frame); return serialize_elem(node.parentNode, frame);
} }

4
tests/end2end/features/search.feature
View File

@ -225,15 +225,11 @@ Feature: Searching on a page
Then the following tabs should be open: Then the following tabs should be open:
- data/search.html (active) - data/search.html (active)
# Following a link selected via JS doesn't work in Qt 5.10 anymore.
@qt!=5.10
Scenario: Follow a manually selected link Scenario: Follow a manually selected link
When I run :jseval --file (testdata)/search_select.js When I run :jseval --file (testdata)/search_select.js
And I run :follow-selected And I run :follow-selected
Then data/hello.txt should be loaded Then data/hello.txt should be loaded
# Following a link selected via JS doesn't work in Qt 5.10 anymore.
@qt!=5.10
Scenario: Follow a manually selected link in a new tab Scenario: Follow a manually selected link in a new tab
When I run :window-only When I run :window-only
And I run :jseval --file (testdata)/search_select.js And I run :jseval --file (testdata)/search_select.js