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

Make sure scripts are removed correctly

Browse Source
This commit is contained in:
Florian Bruhin 2017-12-06 19:56:44 +01:00
parent a37ecc353c
commit 6aafe02320
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/browser/webengine/webenginesettings.py
View File

@ -262,9 +262,10 @@ def inject_userscripts():
scripts = profile.scripts() scripts = profile.scripts()
for script in scripts.toList(): for script in scripts.toList():
if script.name().startswith("GM-"): if script.name().startswith("GM-"):
log.greasemonkey.debug('removing script: {}' log.greasemonkey.debug('Removing script: {}'
.format(script.name())) .format(script.name()))
scripts.remove(script) removed = scripts.remove(script)
assert removed, script.name()
# Then add the new scripts. # Then add the new scripts.
for script in greasemonkey.all_scripts(): for script in greasemonkey.all_scripts():

7
qutebrowser/browser/webengine/webview.py
View File

@ -319,9 +319,10 @@ class WebEnginePage(QWebEnginePage):
scripts = self.scripts() scripts = self.scripts()
for script in scripts.toList(): for script in scripts.toList():
if script.name().startswith("GM-"): if script.name().startswith("GM-"):
really_removed = scripts.remove(script) log.greasemonkey.debug("Removing script: {}"
log.greasemonkey.debug("Removing ({}) script: {}" .format(script.name()))
.format(really_removed, script.name())) removed = scripts.remove(script)
assert removed, script.name()
def _add_script(script, injection_point): def _add_script(script, injection_point):
new_script = QWebEngineScript() new_script = QWebEngineScript()