From 4477e21369edf35335547f203c6b9113f7adb9e9 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 22 Mar 2011 14:54:59 +0900 Subject: [PATCH] make sure we load css on model init --- anki/deck.py | 3 ++- anki/latex.py | 2 +- anki/models.py | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/anki/deck.py b/anki/deck.py index d7987e20e..d1d562016 100644 --- a/anki/deck.py +++ b/anki/deck.py @@ -466,7 +466,8 @@ select id from cards where fid in (select id from facts where mid = ?)""", format = format.replace("cloze:", "ca:") fields = runFilter("mungeFields", fields, model, gname, data, self) html = anki.template.render(format, fields) - d[type] = runFilter("mungeQA", html, fields, model, gname, data, self) + d[type] = runFilter( + "mungeQA", html, type, fields, model, gname, data, self) return d def _qaData(self, where=""): diff --git a/anki/latex.py b/anki/latex.py index 62fda9525..0c0415131 100644 --- a/anki/latex.py +++ b/anki/latex.py @@ -32,7 +32,7 @@ def stripLatex(text): text = text.replace(match.group(), "") return text -def mungeQA(html, fields, model, gname, data, deck): +def mungeQA(html, type, fields, model, gname, data, deck): "Convert TEXT with embedded latex tags to image links." for match in regexps['standard'].finditer(html): html = html.replace(match.group(), _imgLink(deck, match.group(1))) diff --git a/anki/models.py b/anki/models.py index 13ae59e9b..c9ecc7f9b 100644 --- a/anki/models.py +++ b/anki/models.py @@ -61,8 +61,9 @@ class Model(object): self.name, self.fields, self.templates, - self.conf) = self.deck.db.first(""" -select mod, name, flds, tmpls, conf from models where id = ?""", self.id) + self.conf, + self.css) = self.deck.db.first(""" +select mod, name, flds, tmpls, conf, css from models where id = ?""", self.id) self.fields = simplejson.loads(self.fields) self.templates = simplejson.loads(self.templates) self.conf = simplejson.loads(self.conf)