Mercurial Repositories > eric / changeset

--- a/WebBrowser/StatusBar/JavaScriptIcon.py	Sun Feb 11 18:21:11 2018 +0100
+++ b/WebBrowser/StatusBar/JavaScriptIcon.py	Sun Feb 11 18:28:09 2018 +0100
@@ -108,7 +108,8 @@
         
         current = self._testCurrentPageWebAttribute(
             QWebEngineSettings.JavascriptEnabled)
-        self._currentPage().setJavaScriptEnabled(not current)
+        self._setCurrentPageWebAttribute(QWebEngineSettings.JavascriptEnabled,
+                                         not current)
         
         self._window.currentBrowser().reload()
         

--- a/WebBrowser/WebBrowserPage.py	Sun Feb 11 18:21:11 2018 +0100
+++ b/WebBrowser/WebBrowserPage.py	Sun Feb 11 18:28:09 2018 +0100
@@ -152,7 +152,8 @@
         """
         if not url.isEmpty() and url.scheme() == "eric" and \
                 not self.isJavaScriptEnabled():
-            self.setJavaScriptEnabled(True)
+            self.settings().setAttribute(QWebEngineSettings.JavascriptEnabled,
+                                         True)
             self.triggerAction(QWebEnginePage.Reload)
     
     @classmethod
@@ -258,19 +259,6 @@
             else:
                 QWebEnginePage.runJavaScript(self, script, callback)
     
-    def setJavaScriptEnabled(self, enable):
-        """
-        Public method to enable JavaScript.
-        
-        @param enable flag indicating the enabled state to be set
-        @type bool
-        """
-        if not self.url().isEmpty() and self.url().scheme() == "eric":
-            enable = True
-        
-        self.settings().setAttribute(QWebEngineSettings.JavascriptEnabled,
-                                     enable)
-    
     def isJavaScriptEnabled(self):
         """
         Public method to test, if JavaScript is enabled.