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

catching greasemonkey errors aswell

Browse Source
This commit is contained in:
Jesko 2018-08-15 22:52:47 +02:00 committed by Jimmy
parent 583c7e4198
commit 8aa682e769
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/commands.py
View File

@ -2087,7 +2087,7 @@ class CommandDispatcher:
widget = self._current_widget() widget = self._current_widget()
try: try:
widget.run_js_async(js_code, callback=jseval_cb, world=world) widget.run_js_async(js_code, callback=jseval_cb, world=world)
except OverflowError as e: except OverflowError:
raise cmdexc.CommandError("World Id not in valid range") raise cmdexc.CommandError("World Id not in valid range")
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')

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

@ -948,6 +948,11 @@ class _WebEngineScripts(QObject):
new_script = QWebEngineScript() new_script = QWebEngineScript()
try: try:
world = int(script.jsworld) world = int(script.jsworld)
if not 0 <= world < 256:
log.greasemonkey.error(
"script {} has invalid value for '@qute-js-world'"
": {}".format(script.name, script.jsworld))
continue
except ValueError: except ValueError:
try: try:
world = _JS_WORLD_MAP[usertypes.JsWorld[ world = _JS_WORLD_MAP[usertypes.JsWorld[