summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy <jimmy@spalge.com>2018-06-26 14:54:32 +1200
committerJimmy <jimmy@spalge.com>2018-06-26 16:42:31 +1200
commitc43d173197b02bd765a47335643d3643b35f687f (patch)
tree7162fc19e5789c76e59b0a7372949ed8ae1b1f43
parentee2c7658592d65030c76178267d04ac63213b2d9 (diff)
downloadqutebrowser-c43d173197b02bd765a47335643d3643b35f687f.tar.gz
qutebrowser-c43d173197b02bd765a47335643d3643b35f687f.zip
greasemonkey: s/userscripts/greasemonkey_scripts/
No need to confuse developers as well as users.
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py23
1 files changed, 12 insertions, 11 deletions
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 8734a4b04..43fecf9f1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -859,11 +859,12 @@ class _WebEngineScripts(QObject):
# response to urlChanged.
if not qtutils.version_check('5.8'):
self._widget.page().urlChanged.connect(
- self._inject_userscripts_for_url)
+ self._inject_greasemonkey_scripts_for_url)
else:
greasemonkey = objreg.get('greasemonkey')
- greasemonkey.scripts_reloaded.connect(self._inject_all_userscripts)
- self._inject_all_userscripts()
+ greasemonkey.scripts_reloaded.connect(
+ self._inject_all_greasemonkey_scripts)
+ self._inject_all_greasemonkey_scripts()
def _init_stylesheet(self):
"""Initialize custom stylesheets.
@@ -880,23 +881,23 @@ class _WebEngineScripts(QObject):
)
self._inject_early_js('stylesheet', js_code, subframes=True)
- def _inject_userscripts_for_url(self, url):
+ def _inject_greasemonkey_scripts_for_url(self, url):
greasemonkey = objreg.get('greasemonkey')
matching_scripts = greasemonkey.scripts_for(url)
- self._inject_userscripts(
+ self._inject_greasemonkey_scripts(
matching_scripts.start, QWebEngineScript.DocumentCreation, True)
- self._inject_userscripts(
+ self._inject_greasemonkey_scripts(
matching_scripts.end, QWebEngineScript.DocumentReady, False)
- self._inject_userscripts(
+ self._inject_greasemonkey_scripts(
matching_scripts.idle, QWebEngineScript.Deferred, False)
- def _inject_all_userscripts(self):
+ def _inject_all_greasemonkey_scripts(self):
greasemonkey = objreg.get('greasemonkey')
scripts = greasemonkey.all_scripts()
- self._inject_userscripts(scripts)
+ self._inject_greasemonkey_scripts(scripts)
- def _inject_userscripts(self, scripts=None, injection_point=None,
- remove_first=True):
+ def _inject_greasemonkey_scripts(self, scripts=None, injection_point=None,
+ remove_first=True):
"""Register user JavaScript files with the current tab.
Args: