diff -r ebab8ba287e6 -r 6b42677d7043 eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Mon Sep 02 18:50:38 2019 +0200
@@ -22,8 +22,6 @@
from ..WebBrowserPage import WebBrowserPage
from ..WebBrowserWindow import WebBrowserWindow
-from Globals import qVersionTuple
-
class GreaseMonkeyScript(QObject):
"""
@@ -362,38 +360,10 @@
QByteArray(self.fullName().encode("utf-8")),
QCryptographicHash.Md4).toHex()).decode("ascii")
valuesScript = values_js.format(nspace)
- if qVersionTuple() < (5, 8, 0):
- runCheck = """
- for (var value of {0}) {{
- var re = new RegExp(value);
- if (re.test(window.location.href)) {{
- return;
- }}
- }}
- __eric_includes = false;
- for (var value of {1}) {{
- var re = new RegExp(value);
- if (re.test(window.location.href)) {{
- __eric_includes = true;
- break;
- }}
- }}
- if (!__eric_includes) {{
- return;
- }}
- delete __eric_includes;""".format(
- self.__toJavaScriptList(self.__exclude[:]),
- self.__toJavaScriptList(self.__include[:])
- )
- self.__script = "(function(){{{0}\n{1}\n{2}\n{3}\n}})();".format(
- runCheck, valuesScript,
- self.__manager.requireScripts(self.__require), fileData
- )
- else:
- self.__script = "(function(){{{0}\n{1}\n{2}\n}})();".format(
- valuesScript, self.__manager.requireScripts(self.__require),
- fileData
- )
+ self.__script = "(function(){{{0}\n{1}\n{2}\n}})();".format(
+ valuesScript, self.__manager.requireScripts(self.__require),
+ fileData
+ )
self.__valid = True
self.__downloadIcon()
@@ -407,27 +377,16 @@
@rtype QWebEngineScript
@exception ValueError raised to indicate an unsupported start point
"""
- if qVersionTuple() < (5, 8, 0):
- if self.startAt() == GreaseMonkeyScript.DocumentStart:
- injectionPoint = QWebEngineScript.DocumentCreation
- elif self.startAt() == GreaseMonkeyScript.DocumentEnd:
- injectionPoint = QWebEngineScript.DocumentReady
- elif self.startAt() == GreaseMonkeyScript.DocumentIdle:
- injectionPoint = QWebEngineScript.Deferred
- else:
- raise ValueError("Wrong script start point.")
-
script = QWebEngineScript()
script.setSourceCode("{0}\n{1}".format(
bootstrap_js, self.__script
))
script.setName(self.fullName())
- if qVersionTuple() < (5, 8, 0):
- script.setInjectionPoint(injectionPoint)
script.setWorldId(WebBrowserPage.SafeJsWorld)
script.setRunsOnSubFrames(not self.__noFrames)
return script
+ # TODO: get rid of it
def __toJavaScriptList(self, patterns):
"""
Private method to convert a list of str to a string containing a valid
@@ -438,21 +397,7 @@
@return JavaScript script containing the list
@rtype str
"""
- if qVersionTuple() >= (5, 8, 0):
- script = ""
- else:
- patternList = []
- for pattern in patterns:
- if pattern.startswith("/") and pattern.endswith("/") and \
- len(pattern) > 1:
- pattern = pattern[1:-1]
- else:
- pattern = pattern.replace(".", "\\.").replace("*", ".*")
- pattern = "'{0}'".format(pattern)
- patternList.append(pattern)
-
- script = "[{0}]".format(",".join(patternList))
- return script
+ return ""
def updateScript(self):
"""
