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

This commit is contained in:
Florian Bruhin 2018-10-01 11:21:40 +02:00
commit 8f33b89a57
2 changed files with 6 additions and 4 deletions

View File

@ -333,13 +333,13 @@ window._qutebrowser.webelem = (function() {
// it). If nothing is selected but there is something focused, returns // it). If nothing is selected but there is something focused, returns
// "focused" // "focused"
funcs.find_selected_focused_link = () => { funcs.find_selected_focused_link = () => {
const elem = window.getSelection().baseNode; const elem = window.getSelection().anchorNode;
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().baseNode; const node = frame.window.getSelection().anchorNode;
if (node) { if (node) {
return serialize_elem(node.parentNode, frame); return serialize_elem(node.parentNode, frame);
} }

View File

@ -7,6 +7,8 @@ if(s.rangeCount > 0) s.removeAllRanges();
for(var i = 0; i < toSelect.length; i++) { for(var i = 0; i < toSelect.length; i++) {
var range = document.createRange(); var range = document.createRange();
range.selectNode(toSelect[i]); if (toSelect[i].childNodes.length > 0) {
range.selectNodeContents(toSelect[i].childNodes[0]);
s.addRange(range); s.addRange(range);
}
} }