Mercurial Repositories > eric / changeset

--- a/WebBrowser/AdBlock/AdBlockManager.py	Mon Jun 04 19:56:34 2018 +0200
+++ b/WebBrowser/AdBlock/AdBlockManager.py	Tue Jun 05 19:14:10 2018 +0200
@@ -638,10 +638,17 @@
         """
         Private slot to update the adblock matcher.
         """
+        from WebBrowser.WebBrowserWindow import WebBrowserWindow
+        WebBrowserWindow.networkManager().removeUrlInterceptor(
+            self.__interceptor)
+        
         if self.__enabled:
             self.__matcher.update()
         else:
             self.__matcher.clear()
+        
+        WebBrowserWindow.networkManager().installUrlInterceptor(
+            self.__interceptor)
     
     def __canBeBlocked(self, url):
         """

--- a/WebBrowser/GreaseMonkey/GreaseMonkeyJavaScript.py	Mon Jun 04 19:56:34 2018 +0200
+++ b/WebBrowser/GreaseMonkey/GreaseMonkeyJavaScript.py	Tue Jun 05 19:14:10 2018 +0200
@@ -125,7 +125,7 @@
 
 function GM_getValue(aKey, aDefault) {{
     var val = localStorage.getItem("{0}" + aKey)
-    if (null === val && 'undefined' != typeof aDefault) return aDefault;
+    if (null === val) return aDefault;
     return val;
 }}