summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-07-26 14:44:46 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-07-26 14:44:46 +0200
commit99e07f1e3e99c633702b9e10dabce5334098d47e (patch)
tree223c55ab21a4747dfb527127030a322301ef2d23 /addons/web/static/src/js/coresetup.js
parent32190ba02eafcb44c7baafb56865923d5b0ea28c (diff)
Put some qweb globals in the framework
bzr revid: nicolas.vanhoren@openerp.com-20130726124446-6z3xpm1mu22mgep3
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 424782d5e24..7ff082edcce 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -565,12 +565,10 @@ instance.web._lt = function (s) {
return {toString: function () { return instance.web._t(s); }};
};
instance.web.qweb.debug = instance.session.debug;
-instance.web.qweb.default_dict = {
- '_' : _,
+_.extend(instance.web.qweb.default_dict, {
'_t' : instance.web._t,
- 'JSON': JSON,
'__debug__': instance.session.debug,
-};
+});
instance.web.qweb.preprocess_node = function() {
// Note that 'this' is the Qweb Node
switch (this.node.nodeType) {