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

Make sure options in needs_reload are valid

Browse Source
This commit is contained in:
Florian Bruhin 2018-03-06 07:44:20 +01:00
parent afd5d2c728
commit 0a75c5a302
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/browser/webengine/webenginetab.py
View File

@ -33,6 +33,7 @@ from PyQt5.QtNetwork import QAuthenticator
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript
from qutebrowser.config import configdata
from qutebrowser.browser import browsertab, mouse, shared from qutebrowser.browser import browsertab, mouse, shared
from qutebrowser.browser.webengine import (webview, webengineelem, tabhistory, from qutebrowser.browser.webengine import (webview, webengineelem, tabhistory,
interceptor, webenginequtescheme, interceptor, webenginequtescheme,
@ -938,14 +939,18 @@ class WebEngineTab(browsertab.AbstractTab):
@pyqtSlot(usertypes.NavigationRequest) @pyqtSlot(usertypes.NavigationRequest)
def _on_navigation_request(self, navigation): def _on_navigation_request(self, navigation):
super()._on_navigation_request(navigation) super()._on_navigation_request(navigation)
if navigation.accepted and navigation.is_main_frame: if not navigation.accepted or not navigation.is_main_frame:
changed = self.settings.update_for_url(navigation.url) return
needs_reload = {'content.plugins', 'content.javascript.enabled',
'content.javascript.can_access_clipboard'} needs_reload = {'content.plugins', 'content.javascript.enabled',
if (changed & needs_reload and navigation.navigation_type != 'content.javascript.can_access_clipboard'}
navigation.Type.link_clicked): assert needs_reload.issubset(configdata.DATA)
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
self._reload_url = navigation.url changed = self.settings.update_for_url(navigation.url)
if (changed & needs_reload and navigation.navigation_type !=
navigation.Type.link_clicked):
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
self._reload_url = navigation.url
def _connect_signals(self): def _connect_signals(self):
view = self._widget view = self._widget