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

Merge branch 'paretje-webkitelemparent'

Browse Source
This commit is contained in:
Florian Bruhin 2016-10-17 22:29:37 +02:00
commit d24162927a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -160,9 +160,9 @@ Contributors, sorted by the number of commits in descending order:
* Patric Schmitz * Patric Schmitz
* Tarcisio Fedrizzi * Tarcisio Fedrizzi
* Claude * Claude
* Kevin Velghe
* Corentin Julé * Corentin Julé
* meles5 * meles5
* Kevin Velghe
* Philipp Hansch * Philipp Hansch
* Daniel Karbach * Daniel Karbach
* Panagiotis Ktistakis * Panagiotis Ktistakis

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

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

5
tests/end2end/features/hints.feature
View File

@ -180,6 +180,11 @@ Feature: Using hints
- data/hints/iframe_target.html - data/hints/iframe_target.html
- data/hello.txt (active) - 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 ### hints -> auto-follow-timeout
@not_osx @not_osx