langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automatically defer eval() calls until DOM loaded

Browse Source
This commit is contained in:
Damien Elmes 2017-08-02 15:39:49 +10:00
parent 321c4d7ff8
commit 7d14a96889
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
aqt/webview.py
View File

@ -147,6 +147,7 @@ class AnkiWebView(QWebEngineView):
app = QApplication.instance() app = QApplication.instance()
oldFocus = app.focusWidget() oldFocus = app.focusWidget()
self._domDone = False self._domDone = False
self._pendingJS = []
self._page.setHtml(html) self._page.setHtml(html)
# work around webengine stealing focus on setHtml() # work around webengine stealing focus on setHtml()
if oldFocus: if oldFocus:
@ -207,10 +208,16 @@ body { zoom: %f; %s }
return '<link rel="stylesheet" type="text/css" href="%s">' % self.webBundlePath(fname) return '<link rel="stylesheet" type="text/css" href="%s">' % self.webBundlePath(fname)
def eval(self, js): def eval(self, js):
self.page().runJavaScript(js) self.evalWithCallback(js, None)
def evalWithCallback(self, js, cb): def evalWithCallback(self, js, cb):
self.page().runJavaScript(js, cb) if self._domDone:
if cb:
self.page().runJavaScript(js, cb)
else:
self.page().runJavaScript(js)
else:
self._pendingJS.append([js, cb])
def _openLinksExternally(self, url): def _openLinksExternally(self, url):
openLink(url) openLink(url)
@ -218,6 +225,10 @@ body { zoom: %f; %s }
def _onBridgeCmd(self, cmd): def _onBridgeCmd(self, cmd):
if cmd == "domDone": if cmd == "domDone":
self._domDone = True self._domDone = True
# run through any pending js calls
for js, cb in self._pendingJS:
self.evalWithCallback(js, cb)
self._pendingJS = []
self.onLoadFinished() self.onLoadFinished()
else: else:
self.onBridgeCmd(cmd) self.onBridgeCmd(cmd)