Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Fri Jun 17 19:38:14 2016 +0200
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Sat Jun 18 17:17:05 2016 +0200
@@ -48,7 +48,7 @@
 QWebEnginePage
 <h3>Class Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>SafeJsWorld</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -105,6 +105,9 @@
 <td><a href="#WebBrowserPage.resultCallback">resultCallback</a></td>
 <td></td>
 </tr><tr>
+<td><a href="#WebBrowserPage.runJavaScript">runJavaScript</a></td>
+<td>Public method to run a script in the context of the page.</td>
+</tr><tr>
 <td><a href="#WebBrowserPage.scroll">scroll</a></td>
 <td>Public method to scroll by the given amount of pixels.</td>
 </tr><tr>
@@ -254,13 +257,19 @@
 </dd>
 </dl><a NAME="WebBrowserPage.execJavaScript" ID="WebBrowserPage.execJavaScript"></a>
 <h4>WebBrowserPage.execJavaScript</h4>
-<b>execJavaScript</b>(<i>script</i>)
+<b>execJavaScript</b>(<i>script, worldId=QWebEngineScript.MainWorld, timeout=500</i>)
 <p>
         Public method to execute a JavaScript function synchroneously.
 </p><dl>
 <dt><i>script</i> (str)</dt>
 <dd>
 JavaScript script source to be executed
+</dd><dt><i>worldId</i> (int)</dt>
+<dd>
+ID to run the script under
+</dd><dt><i>timeout</i> (int)</dt>
+<dd>
+max. time the script is given to execute
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -349,7 +358,24 @@
 </dl><a NAME="WebBrowserPage.resultCallback" ID="WebBrowserPage.resultCallback"></a>
 <h4>WebBrowserPage.resultCallback</h4>
 <b>resultCallback</b>(<i>resDict=resultDict</i>)
-<a NAME="WebBrowserPage.scroll" ID="WebBrowserPage.scroll"></a>
+<a NAME="WebBrowserPage.runJavaScript" ID="WebBrowserPage.runJavaScript"></a>
+<h4>WebBrowserPage.runJavaScript</h4>
+<b>runJavaScript</b>(<i>script, worldId=-1, callback=None</i>)
+<p>
+        Public method to run a script in the context of the page.
+</p><dl>
+<dt><i>script</i> (str)</dt>
+<dd>
+JavaScript script source to be executed
+</dd><dt><i>worldId</i> (int)</dt>
+<dd>
+ID to run the script under
+</dd><dt><i>callback</i> (function)</dt>
+<dd>
+callback function to be executed when the script has
+            ended
+</dd>
+</dl><a NAME="WebBrowserPage.scroll" ID="WebBrowserPage.scroll"></a>
 <h4>WebBrowserPage.scroll</h4>
 <b>scroll</b>(<i>x, y</i>)
 <p>