From 3908e0eb885467a1196ac0ce7fec48c983ecda7f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 7 Sep 2011 10:16:33 +0200 Subject: [PATCH] [ADD] QWeb2: add default dict bzr revid: fme@openerp.com-20110907081633-vhuaf55e1dxxja2z --- addons/web/static/lib/qweb/qweb2.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js index cfb9c9c461d..473e80d1229 100644 --- a/addons/web/static/lib/qweb/qweb2.js +++ b/addons/web/static/lib/qweb/qweb2.js @@ -201,7 +201,7 @@ QWeb2.Engine = (function() { this.templates = {}; this.compiled_templates = {}; this.extend_templates = {}; - this.dict = {}; + this.default_dict = {}; this.tools = QWeb2.tools; this.jQuery = window.jQuery; this.reserved_words = QWeb2.RESERVED_WORDS.slice(0); @@ -323,10 +323,12 @@ QWeb2.Engine = (function() { " return r.join('');"; }, render : function(template, dict) { + var ndict = QWeb2.tools.extend({}, this.default_dict); + QWeb2.tools.extend(ndict, dict); if (this.debug && window['console'] !== undefined) { console.time("QWeb render template " + template); } - var r = this._render(template, dict); + var r = this._render(template, ndict); if (this.debug && window['console'] !== undefined) { console.timeEnd("QWeb render template " + template); }