diff --git a/qutebrowser/browser/navigate.py b/qutebrowser/browser/navigate.py index a3ec15458..5fd047386 100644 --- a/qutebrowser/browser/navigate.py +++ b/qutebrowser/browser/navigate.py @@ -141,6 +141,5 @@ def prevnext(*, browsertab, win_id, baseurl, prev=False, else: browsertab.openurl(url) - selector = ', '.join([webelem.SELECTORS[webelem.Group.links], - webelem.SELECTORS[webelem.Group.prevnext]]) - browsertab.elements.find_css(selector, _prevnext_cb) + browsertab.elements.find_css(webelem.SELECTORS[webelem.Group.links], + _prevnext_cb) diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py index d2e499b83..ec523e0e4 100644 --- a/qutebrowser/browser/webelem.py +++ b/qutebrowser/browser/webelem.py @@ -34,8 +34,7 @@ from qutebrowser.keyinput import modeman from qutebrowser.utils import log, usertypes, utils, qtutils, objreg -Group = usertypes.enum('Group', ['all', 'links', 'images', 'url', 'prevnext', - 'inputs']) +Group = usertypes.enum('Group', ['all', 'links', 'images', 'url', 'inputs']) SELECTORS = { @@ -45,8 +44,6 @@ SELECTORS = { Group.links: 'a[href], area[href], link[href], [role=link][href]', Group.images: 'img', Group.url: '[src], [href]', - Group.prevnext: 'a[href], area[href], button[href], link[href], ' - '[role=button][href]', Group.inputs: ('input[type=text], input[type=email], input[type=url], ' 'input[type=tel], input[type=number], ' 'input[type=password], input[type=search], ' diff --git a/tests/unit/browser/webkit/test_webkitelem.py b/tests/unit/browser/webkit/test_webkitelem.py index 4915c1fba..4de700805 100644 --- a/tests/unit/browser/webkit/test_webkitelem.py +++ b/tests/unit/browser/webkit/test_webkitelem.py @@ -147,19 +147,18 @@ class SelectionAndFilterTests: ('', [webelem.Group.all]), ('', [webelem.Group.all, webelem.Group.links, - webelem.Group.prevnext, webelem.Group.url]), + webelem.Group.url]), ('', [webelem.Group.all, webelem.Group.links, - webelem.Group.prevnext, webelem.Group.url]), ('', [webelem.Group.all]), ('', [webelem.Group.all, webelem.Group.links, - webelem.Group.prevnext, webelem.Group.url]), + webelem.Group.url]), ('', [webelem.Group.all]), ('', [webelem.Group.all, webelem.Group.links, - webelem.Group.prevnext, webelem.Group.url]), + webelem.Group.url]), ('