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

Added a fallback for when JavaScript is disabled.

Browse Source
This commit is contained in:
Antoni Boucher 2015-05-30 13:56:36 -04:00
parent a56a14fb70
commit 989e3b7291
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qutebrowser/browser/commands.py
View File

@ -25,7 +25,9 @@ import shlex
import subprocess import subprocess
import posixpath import posixpath
import functools import functools
from xml.etree import ElementTree
from PyQt5.QtWebKit import QWebSettings
from PyQt5.QtWidgets import QApplication, QTabBar from PyQt5.QtWidgets import QApplication, QTabBar
from PyQt5.QtCore import Qt, QUrl, QEvent from PyQt5.QtCore import Qt, QUrl, QEvent
from PyQt5.QtGui import QClipboard, QKeyEvent from PyQt5.QtGui import QClipboard, QKeyEvent
@ -985,7 +987,8 @@ class CommandDispatcher:
url = objreg.get('quickmark-manager').get(name) url = objreg.get('quickmark-manager').get(name)
self._open(url, tab, bg, window) self._open(url, tab, bg, window)
@cmdutils.register(instance='command-dispatcher', name='select-follow', scope='window') @cmdutils.register(instance='command-dispatcher', name='select-follow',
scope='window')
def select_follow(self, tab=False): def select_follow(self, tab=False):
"""Follow the selected text. """Follow the selected text.
@ -993,9 +996,19 @@ class CommandDispatcher:
tab: Load the selected link in a new tab. tab: Load the selected link in a new tab.
""" """
widget = self._current_widget() widget = self._current_widget()
if QWebSettings.globalSettings().testAttribute(
QWebSettings.JavascriptEnabled):
if tab: if tab:
widget.page().open_target = usertypes.ClickTarget.tab widget.page().open_target = usertypes.ClickTarget.tab
widget.page().currentFrame().evaluateJavaScript('window.getSelection().anchorNode.parentNode.click()') widget.page().currentFrame().evaluateJavaScript(
'window.getSelection().anchorNode.parentNode.click()')
else:
selected_element = ElementTree.fromstring(
'<html>' + widget.selectedHtml() + '</html>').find('a')
if selected_element is not None:
url = selected_element.attrib['href']
if url:
self._open(QUrl(url), tab)
@cmdutils.register(instance='command-dispatcher', name='inspector', @cmdutils.register(instance='command-dispatcher', name='inspector',
scope='window') scope='window')