Fix enum bugs

This commit is contained in:
Florian Bruhin 2014-05-06 21:09:09 +02:00
parent 164dcfb6bd
commit 14873285e6
2 changed files with 6 additions and 3 deletions

View File

@ -431,7 +431,8 @@ class CurCommandDispatcher(QObject):
and do everything async.
"""
frame = self._tabs.currentWidget().page_.currentFrame()
elem = frame.findFirstElement(webelem.SELECTORS['editable_focused'])
elem = frame.findFirstElement(webelem.SELECTORS[
webelem.Group.editable_focused])
if elem.isNull():
message.error("No editable element focused!")
return

View File

@ -313,13 +313,15 @@ class HintManager(QObject):
def _find_prevnext(self, frame, prev=False):
"""Find a prev/next element in frame."""
# First check for <link rel="prev(ious)|next">
elems = frame.findAllElements(webelem.SELECTORS['prevnext_rel'])
elems = frame.findAllElements(
webelem.SELECTORS[webelem.Group.prevnext_rel])
rel_values = ['prev', 'previous'] if prev else ['next']
for e in elems:
if e.attribute('rel') in rel_values:
return e
# Then check for regular links
elems = frame.findAllElements(webelem.SELECTORS['prevnext'])
elems = frame.findAllElements(
webelem.SELECTORS[webelem.Group.prevnext])
option = 'prev-regexes' if prev else 'next-regexes'
if not elems:
return None