Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Fri Feb 16 20:15:49 2018 +0100
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Fri Feb 16 20:18:29 2018 +0100
@@ -45,7 +45,15 @@
     Class implementing an enhanced web page.
 </p><h3>Signals</h3>
 <dl>
-<dt>safeBrowsingAbort()</dt>
+<dt>navigationRequestAccepted(url, navigation type, main frame)</dt>
+<dd>
+emitted
+        to signal an accepted navigation request
+</dd><dt>printRequested()</dt>
+<dd>
+emitted to indicate a print request of the shown
+        web page
+</dd><dt>safeBrowsingAbort()</dt>
 <dd>
 emitted to indicate an abort due to a safe
         browsing event
@@ -59,7 +67,7 @@
 QWebEnginePage
 <h3>Class Attributes</h3>
 <table>
-<tr><td>SafeJsWorld</td></tr>
+<tr><td>SafeJsWorld</td></tr><tr><td>UnsafeJsWorld</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -86,7 +94,13 @@
 <td><a href="#WebBrowserPage.__fullScreenRequested">__fullScreenRequested</a></td>
 <td>Private slot handling a full screen request.</td>
 </tr><tr>
-<td><a href="#WebBrowserPage.__setupWebChannel">__setupWebChannel</a></td>
+<td><a href="#WebBrowserPage.__loadProgressSlot">__loadProgressSlot</a></td>
+<td>Private slot to implement a workaround for the loadFinished signal not working properly in Qt 5.10.0.</td>
+</tr><tr>
+<td><a href="#WebBrowserPage.__setupChannelTimeout">__setupChannelTimeout</a></td>
+<td>Private slot to initiate the setup of the web channel.</td>
+</tr><tr>
+<td><a href="#WebBrowserPage.__setupWebChannelForUrl">__setupWebChannelForUrl</a></td>
 <td>Private method to setup a web channel to our external object.</td>
 </tr><tr>
 <td><a href="#WebBrowserPage.__urlChanged">__urlChanged</a></td>
@@ -139,9 +153,6 @@
 </tr><tr>
 <td><a href="#WebBrowserPage.scrollTo">scrollTo</a></td>
 <td>Public method to scroll to the given position.</td>
-</tr><tr>
-<td><a href="#WebBrowserPage.setJavaScriptEnabled">setJavaScriptEnabled</a></td>
-<td>Public method to enable JavaScript.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -222,12 +233,33 @@
 <dd>
 reference to the full screen request
 </dd>
-</dl><a NAME="WebBrowserPage.__setupWebChannel" ID="WebBrowserPage.__setupWebChannel"></a>
-<h4>WebBrowserPage.__setupWebChannel</h4>
-<b>__setupWebChannel</b>(<i></i>)
+</dl><a NAME="WebBrowserPage.__loadProgressSlot" ID="WebBrowserPage.__loadProgressSlot"></a>
+<h4>WebBrowserPage.__loadProgressSlot</h4>
+<b>__loadProgressSlot</b>(<i>progress</i>)
+<p>
+        Private slot to implement a workaround for the loadFinished signal
+        not working properly in Qt 5.10.0.
+</p><dl>
+<dt><i>progress</i> (int)</dt>
+<dd>
+load progress in percent
+</dd>
+</dl><a NAME="WebBrowserPage.__setupChannelTimeout" ID="WebBrowserPage.__setupChannelTimeout"></a>
+<h4>WebBrowserPage.__setupChannelTimeout</h4>
+<b>__setupChannelTimeout</b>(<i></i>)
+<p>
+        Private slot to initiate the setup of the web channel.
+</p><a NAME="WebBrowserPage.__setupWebChannelForUrl" ID="WebBrowserPage.__setupWebChannelForUrl"></a>
+<h4>WebBrowserPage.__setupWebChannelForUrl</h4>
+<b>__setupWebChannelForUrl</b>(<i>url</i>)
 <p>
         Private method to setup a web channel to our external object.
-</p><a NAME="WebBrowserPage.__urlChanged" ID="WebBrowserPage.__urlChanged"></a>
+</p><dl>
+<dt><i>url</i> (QUrl)</dt>
+<dd>
+URL for which to setup the web channel
+</dd>
+</dl><a NAME="WebBrowserPage.__urlChanged" ID="WebBrowserPage.__urlChanged"></a>
 <h4>WebBrowserPage.__urlChanged</h4>
 <b>__urlChanged</b>(<i>url</i>)
 <p>
@@ -498,16 +530,6 @@
 <dd>
 position to scroll to
 </dd>
-</dl><a NAME="WebBrowserPage.setJavaScriptEnabled" ID="WebBrowserPage.setJavaScriptEnabled"></a>
-<h4>WebBrowserPage.setJavaScriptEnabled</h4>
-<b>setJavaScriptEnabled</b>(<i>enable</i>)
-<p>
-        Public method to enable JavaScript.
-</p><dl>
-<dt><i>enable</i> (bool)</dt>
-<dd>
-flag indicating the enabled state to be set
-</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />