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

Clean up handling of focus element

Browse Source 
Also fixes #1359.
This commit is contained in:
Florian Bruhin 2016-08-08 14:05:30 +02:00
parent 27330bd4d1
commit 0b16a36120
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/browser/webelem.py
View File

@ -36,7 +36,7 @@ from qutebrowser.utils import log, usertypes, utils, qtutils
Group = usertypes.enum('Group', ['all', 'links', 'images', 'url', 'prevnext', Group = usertypes.enum('Group', ['all', 'links', 'images', 'url', 'prevnext',
'focus', 'inputs']) 'inputs'])
SELECTORS = { SELECTORS = {
@ -47,7 +47,6 @@ SELECTORS = {
Group.images: 'img', Group.images: 'img',
Group.url: '[src], [href]', Group.url: '[src], [href]',
Group.prevnext: 'a, area, button, link, [role=button]', Group.prevnext: 'a, area, button, link, [role=button]',
Group.focus: '*:focus',
Group.inputs: ('input[type=text], input[type=email], input[type=url], ' Group.inputs: ('input[type=text], input[type=email], input[type=url], '
'input[type=tel], input[type=number], ' 'input[type=tel], input[type=number], '
'input[type=password], input[type=search], ' 'input[type=password], input[type=search], '

2
qutebrowser/browser/webkit/webkitelem.py
View File

@ -353,5 +353,5 @@ def focus_elem(frame):
Args: Args:
frame: The QWebFrame to search in. frame: The QWebFrame to search in.
""" """
elem = frame.findFirstElement(webelem.SELECTORS[webelem.Group.focus]) elem = frame.findFirstElement('*:focus')
return WebKitElement(elem) return WebKitElement(elem)

2
qutebrowser/browser/webkit/webview.py
View File

@ -325,7 +325,7 @@ class WebView(QWebView):
return return
frame = self.page().currentFrame() frame = self.page().currentFrame()
try: try:
elem = webkitelem.WebKitElement(frame.findFirstElement(':focus')) elem = webkitelem.focus_elem(frame)
except webkitelem.IsNullError: except webkitelem.IsNullError:
log.webview.debug("Focused element is null!") log.webview.debug("Focused element is null!")
return return

2
tests/unit/browser/webkit/test_webkitelem.py
View File

@ -188,7 +188,7 @@ class SelectionAndFilterTests:
webelem.Group.url]), webelem.Group.url]),
] ]
GROUPS = [e for e in webelem.Group if e != webelem.Group.focus] GROUPS = list(webelem.Group)
COMBINATIONS = list(itertools.product(TESTS, GROUPS)) COMBINATIONS = list(itertools.product(TESTS, GROUPS))