diff --git a/aqt/reviewer.py b/aqt/reviewer.py index 29c453d56..dfe359c92 100644 --- a/aqt/reviewer.py +++ b/aqt/reviewer.py @@ -135,7 +135,7 @@ function _typeAnsPress() { self.web.eval("_updateQA(%s);" % simplejson.dumps(q)) self._showAnswerButton() # if we have a type answer field, focus main web - if self.typeField: + if self.typeCorrect: self.mw.web.setFocus() # user hook runHook('showQuestion') @@ -239,20 +239,24 @@ img { max-width: 95%; max-height: 95%; } return self.typeAnsAnswerFilter(buf) def typeAnsQuestionFilter(self, buf): - self.typeField = None + self.typeCorrect = None m = re.search(self.typeAnsPat, buf) if not m: return buf fld = m.group(1) for f in self.card.model()['flds']: if f['name'] == fld: - self.typeField = f + self.typeCorrect = self.card.note()[f['name']] self.typeFont = f['font'] self.typeSize = f['size'] break - if not self.typeField: - return re.sub( - self.typeAnsPat, _("Type answer: unknown field %s") % fld, buf) + if not self.typeCorrect: + if self.typeCorrect is None: + return re.sub( + self.typeAnsPat, _("Type answer: unknown field %s") % fld, buf) + else: + # empty field, remove type answer pattern + return re.sub(self.typeAnsPat, "", buf) return re.sub(self.typeAnsPat, """