Merge branch 'webkitelemparent' of https://github.com/paretje/qutebrowser into paretje-webkitelemparent

This commit is contained in:
Florian Bruhin 2016-10-17 22:26:58 +02:00
commit ab43ba71d2
2 changed files with 6 additions and 1 deletions

View File

@ -148,7 +148,7 @@ class WebKitElement(webelem.AbstractWebElement):
def parent(self):
self._check_vanished()
elem = self._elem.parent()
if elem is None:
if elem is None or elem.isNull():
return None
return WebKitElement(elem, tab=self._tab)

View File

@ -180,6 +180,11 @@ Feature: Using hints
- data/hints/iframe_target.html
- data/hello.txt (active)
Scenario: Clicking on iframe with :hint all current
When I open data/hints/iframe.html
And I hint with args "all current" and follow a
Then no crash should happen
### hints -> auto-follow-timeout
@not_osx