GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-21 23:42:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

process events before any dom op

Browse source
This commit is contained in:
Damien Elmes 2012-03-25 02:28:57 +09:00
parent d99b707d67
commit 1b489eea0b
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aqt/__init__.py
View file

@ -4,7 +4,7 @@
import os, sys import os, sys
from aqt.qt import * from aqt.qt import *
appVersion="2.0-alpha8" appVersion="2.0-alpha9"
appWebsite="http://ankisrs.net/" appWebsite="http://ankisrs.net/"
appHelpSite="http://ankisrs.net/docs/dev/manual.html" appHelpSite="http://ankisrs.net/docs/dev/manual.html"
appChanges="http://ankisrs.net/docs/dev/changes.html" appChanges="http://ankisrs.net/docs/dev/changes.html"

32
aqt/editor.py
View file

@ -585,22 +585,22 @@ class Editor(object):
###################################################################### ######################################################################
def toggleBold(self, bool): def toggleBold(self, bool):
self.web.eval("setFormat('bold');") self._eval("setFormat('bold');")
def toggleItalic(self, bool): def toggleItalic(self, bool):
self.web.eval("setFormat('italic');") self._eval("setFormat('italic');")
def toggleUnderline(self, bool): def toggleUnderline(self, bool):
self.web.eval("setFormat('underline');") self._eval("setFormat('underline');")
def toggleSuper(self, bool): def toggleSuper(self, bool):
self.web.eval("setFormat('superscript');") self._eval("setFormat('superscript');")
def toggleSub(self, bool): def toggleSub(self, bool):
self.web.eval("setFormat('subscript');") self._eval("setFormat('subscript');")
def removeFormat(self): def removeFormat(self):
self.web.eval("setFormat('removeFormat');") self._eval("setFormat('removeFormat');")
def onCloze(self): def onCloze(self):
# check that the model is set up for cloze deletion # check that the model is set up for cloze deletion
@ -617,7 +617,13 @@ class Editor(object):
next -= 1 next -= 1
else: else:
next = 1 next = 1
self.web.eval("wrap('{{c%d::', '}}');" % next) self._eval("wrap('{{c%d::', '}}');" % next)
def _eval(self, str):
# some versions of webkit crash if we try a dom-modifying operation
# before outstanding UI events have been processed
self.mw.app.processEvents()
self.mw.progress.timer(100, lambda: self.web.eval(str), False)
# Foreground colour # Foreground colour
###################################################################### ######################################################################
@ -718,8 +724,7 @@ class Editor(object):
recent = self.mw.pm.profile['recentColours'] recent = self.mw.pm.profile['recentColours']
recent.remove(colour) recent.remove(colour)
recent.append(colour) recent.append(colour)
self.mw.app.processEvents() self._eval("setFormat('forecolor', '%s')" % colour)
self.web.eval("setFormat('forecolor', '%s')" % colour)
self.colourDiag.close() self.colourDiag.close()
self.colourChanged() self.colourChanged()
@ -748,8 +753,7 @@ class Editor(object):
def addMedia(self, path, canDelete=False): def addMedia(self, path, canDelete=False):
html = self._addMedia(path, canDelete) html = self._addMedia(path, canDelete)
self.mw.app.processEvents() self._eval("setFormat('inserthtml', %s);" % simplejson.dumps(html))
self.web.eval("setFormat('inserthtml', %s);" % simplejson.dumps(html))
def _addMedia(self, path, canDelete=False): def _addMedia(self, path, canDelete=False):
"Add to media folder and return basename." "Add to media folder and return basename."
@ -799,13 +803,13 @@ class Editor(object):
###################################################################### ######################################################################
def insertLatex(self): def insertLatex(self):
self.web.eval("wrap('[latex]', '[/latex]');") self._eval("wrap('[latex]', '[/latex]');")
def insertLatexEqn(self): def insertLatexEqn(self):
self.web.eval("wrap('[$]', '[/$]');") self._eval("wrap('[$]', '[/$]');")
def insertLatexMathEnv(self): def insertLatexMathEnv(self):
self.web.eval("wrap('[$$]', '[/$$]');") self._eval("wrap('[$$]', '[/$$]');")
# Keyboard layout # Keyboard layout
###################################################################### ######################################################################