GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-11 07:07:13 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix review timer

Browse source
This commit is contained in:
Damien Elmes 2012-02-24 22:17:33 +09:00
parent ff514103ed
commit 7b70536354
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
aqt/reviewer.py
View file

@ -401,10 +401,6 @@ td { font-weight: bold; font-size: 12px; }
""" """
def _bottomHTML(self): def _bottomHTML(self):
if not self.card.deckConf().get('timer'):
maxTime = 0
else:
maxTime = self.card.deckConf()['maxTaken']
return """ return """
<table width=100%% cellspacing=0 cellpadding=0> <table width=100%% cellspacing=0 cellpadding=0>
<tr> <tr>
@ -421,6 +417,7 @@ td { font-weight: bold; font-size: 12px; }
</table> </table>
<script> <script>
var time = %(time)d; var time = %(time)d;
var maxTime = 0;
$(function () { $(function () {
$("#ansbut").focus(); $("#ansbut").focus();
updateTime(); updateTime();
@ -428,10 +425,10 @@ setInterval(function () { time += 1; updateTime() }, 1000);
}); });
var updateTime = function () { var updateTime = function () {
if (!%(maxTime)s) { if (!maxTime) {
return; return;
} }
time = Math.min(%(maxTime)s, time); time = Math.min(maxTime, time);
var m = Math.floor(time / 60); var m = Math.floor(time / 60);
var s = time %% 60; var s = time %% 60;
if (s < 10) { if (s < 10) {
@ -441,10 +438,12 @@ var updateTime = function () {
e.text(m + ":" + s); e.text(m + ":" + s);
} }
function showQuestion(txt) { function showQuestion(txt, maxTime_) {
// much faster than jquery's .html() // much faster than jquery's .html()
$("#middle")[0].innerHTML = txt; $("#middle")[0].innerHTML = txt;
$("#ansbut").focus(); $("#ansbut").focus();
time = 0;
maxTime = maxTime_;
} }
function showAnswer(txt) { function showAnswer(txt) {
@ -454,8 +453,7 @@ function showAnswer(txt) {
</script> </script>
""" % dict(rem=self._remaining(), edit=_("Edit"), """ % dict(rem=self._remaining(), edit=_("Edit"),
more=_("More"), time=self.card.timeTaken()/1000, more=_("More"), time=self.card.timeTaken()/1000)
maxTime=maxTime)
def _showAnswerButton(self): def _showAnswerButton(self):
self._bottomReady = True self._bottomReady = True
@ -466,7 +464,12 @@ function showAnswer(txt) {
self._remaining(), _("Show Answer")) self._remaining(), _("Show Answer"))
# wrap it in a table so it has the same top margin as the ease buttons # wrap it in a table so it has the same top margin as the ease buttons
middle = "<table cellpadding=0><tr><td class=stat2 align=center>%s</td></tr></table>" % middle middle = "<table cellpadding=0><tr><td class=stat2 align=center>%s</td></tr></table>" % middle
self.bottom.web.eval("showQuestion(%s);" % simplejson.dumps(middle)) if not self.card.deckConf().get('timer'):
maxTime = 0
else:
maxTime = self.card.deckConf()['maxTaken']
self.bottom.web.eval("showQuestion(%s,%d);" % (
simplejson.dumps(middle), maxTime))
def _showEaseButtons(self): def _showEaseButtons(self):
self.bottom.web.setFocus() self.bottom.web.setFocus()