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

greasemonkey: s/userscripts/greasemonkey_scripts/

Browse Source 
No need to confuse developers as well as users.
This commit is contained in:
Jimmy 2018-06-26 14:54:32 +12:00
parent ee2c765859
commit c43d173197
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,11 +859,12 @@ class _WebEngineScripts(QObject):
# response to urlChanged. # response to urlChanged.
if not qtutils.version_check('5.8'): if not qtutils.version_check('5.8'):
self._widget.page().urlChanged.connect( self._widget.page().urlChanged.connect(
self._inject_userscripts_for_url) self._inject_greasemonkey_scripts_for_url)
else: else:
greasemonkey = objreg.get('greasemonkey') greasemonkey = objreg.get('greasemonkey')
greasemonkey.scripts_reloaded.connect(self._inject_all_userscripts) greasemonkey.scripts_reloaded.connect(
self._inject_all_userscripts() self._inject_all_greasemonkey_scripts)
self._inject_all_greasemonkey_scripts()
def _init_stylesheet(self): def _init_stylesheet(self):
"""Initialize custom stylesheets. """Initialize custom stylesheets.
@ -880,23 +881,23 @@ class _WebEngineScripts(QObject):
) )
self._inject_early_js('stylesheet', js_code, subframes=True) 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') greasemonkey = objreg.get('greasemonkey')
matching_scripts = greasemonkey.scripts_for(url) matching_scripts = greasemonkey.scripts_for(url)
self._inject_userscripts( self._inject_greasemonkey_scripts(
matching_scripts.start, QWebEngineScript.DocumentCreation, True) matching_scripts.start, QWebEngineScript.DocumentCreation, True)
self._inject_userscripts( self._inject_greasemonkey_scripts(
matching_scripts.end, QWebEngineScript.DocumentReady, False) matching_scripts.end, QWebEngineScript.DocumentReady, False)
self._inject_userscripts( self._inject_greasemonkey_scripts(
matching_scripts.idle, QWebEngineScript.Deferred, False) matching_scripts.idle, QWebEngineScript.Deferred, False)
def _inject_all_userscripts(self): def _inject_all_greasemonkey_scripts(self):
greasemonkey = objreg.get('greasemonkey') greasemonkey = objreg.get('greasemonkey')
scripts = greasemonkey.all_scripts() scripts = greasemonkey.all_scripts()
self._inject_userscripts(scripts) self._inject_greasemonkey_scripts(scripts)
def _inject_userscripts(self, scripts=None, injection_point=None, def _inject_greasemonkey_scripts(self, scripts=None, injection_point=None,
remove_first=True): remove_first=True):
"""Register user JavaScript files with the current tab. """Register user JavaScript files with the current tab.
Args: Args: