Mercurial Repositories > eric / file diff

--- a/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Sun Mar 20 15:17:31 2016 +0100
+++ b/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Sun Mar 20 20:13:29 2016 +0100
@@ -208,12 +208,10 @@
             
             self.scriptChanged.emit()
     
-    def __parseScript(self, path):
+    def __parseScript(self):
         """
         Private method to parse the given script and populate the data
         structure.
-        
-        @param path path of the Javascript file (string)
         """
         self.__name = ""
         self.__namespace = "GreaseMonkeyNS"
@@ -233,7 +231,7 @@
         self.__noFrames = False
         
         try:
-            f = open(path, "r", encoding="utf-8")
+            f = open(self.__fileName, "r", encoding="utf-8")
             fileData = f.read()
             f.close()
         except (IOError, OSError):
@@ -339,6 +337,7 @@
                 self.__toJavaScriptList(self.__exclude[:]),
                 self.__toJavaScriptList(self.__include[:])
             )
+        runCheck = ""
         self.__script = "(function(){{{0}\n{1}\n{2}\n{3}\n}})();".format(
             runCheck, valuesScript,
             self.__manager.requireScripts(requireList), fileData