Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserPage.py
WebBrowser/WebBrowserPage.py
- changeset 5736
- 000ea446ff4b
- parent 5716
- 27a7c7064686
- child 5774
- a559df54a729
equal
deleted
inserted
replaced
| 5735:f606dbe20be6 | 5736:000ea446ff4b |
|---|---|
| 12 try: | 12 try: |
| 13 str = unicode # __IGNORE_EXCEPTION__ | 13 str = unicode # __IGNORE_EXCEPTION__ |
| 14 except NameError: | 14 except NameError: |
| 15 pass | 15 pass |
| 16 | 16 |
| 17 from PyQt5.QtCore import pyqtSlot, qVersion, QUrl, QTimer, QEventLoop, QPoint | 17 from PyQt5.QtCore import pyqtSlot, QUrl, QTimer, QEventLoop, QPoint |
| 18 from PyQt5.QtGui import QDesktopServices | 18 from PyQt5.QtGui import QDesktopServices |
| 19 from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineSettings, \ | 19 from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineSettings, \ |
| 20 QWebEngineScript | 20 QWebEngineScript |
| 21 from PyQt5.QtWebChannel import QWebChannel | 21 from PyQt5.QtWebChannel import QWebChannel |
| 22 | 22 |
| 25 from .JavaScript.ExternalJsObject import ExternalJsObject | 25 from .JavaScript.ExternalJsObject import ExternalJsObject |
| 26 | 26 |
| 27 from .Tools.WebHitTestResult import WebHitTestResult | 27 from .Tools.WebHitTestResult import WebHitTestResult |
| 28 | 28 |
| 29 import Preferences | 29 import Preferences |
| 30 from Globals import qVersionTuple | |
| 30 | 31 |
| 31 | 32 |
| 32 class WebBrowserPage(QWebEnginePage): | 33 class WebBrowserPage(QWebEnginePage): |
| 33 """ | 34 """ |
| 34 Class implementing an enhanced web page. | 35 Class implementing an enhanced web page. |
| 35 """ | 36 """ |
| 36 if qVersion() >= "5.7.0": | 37 if qVersionTuple() >= (5, 7, 0): |
| 37 # SafeJsWorld = QWebEngineScript.ApplicationWorld | 38 # SafeJsWorld = QWebEngineScript.ApplicationWorld |
| 38 SafeJsWorld = QWebEngineScript.MainWorld | 39 SafeJsWorld = QWebEngineScript.MainWorld |
| 39 else: | 40 else: |
| 40 SafeJsWorld = QWebEngineScript.MainWorld | 41 SafeJsWorld = QWebEngineScript.MainWorld |
| 41 | 42 |
| 201 @type int | 202 @type int |
| 202 @param callback callback function to be executed when the script has | 203 @param callback callback function to be executed when the script has |
| 203 ended | 204 ended |
| 204 @type function | 205 @type function |
| 205 """ | 206 """ |
| 206 if qVersion() >= "5.7.0" and worldId > -1: | 207 if qVersionTuple() >= (5, 7, 0) and worldId > -1: |
| 207 if callback is None: | 208 if callback is None: |
| 208 QWebEnginePage.runJavaScript(self, script, worldId) | 209 QWebEnginePage.runJavaScript(self, script, worldId) |
| 209 else: | 210 else: |
| 210 QWebEnginePage.runJavaScript(self, script, worldId, callback) | 211 QWebEnginePage.runJavaScript(self, script, worldId, callback) |
| 211 else: | 212 else: |
