summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/core.js
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2011-11-15 13:30:59 +0100
committerFabien Meghazi <fme@openerp.com>2011-11-15 13:30:59 +0100
commitdb2c85635b00401373d37873ae4df7d75285c45a (patch)
tree73bc22b9b3612961cddb03e4a524e077a3d5cb42 /addons/web/static/src/js/core.js
parent2b7a072a3e7a4505e33c5f25e059607f3039b06d (diff)
[IMP] Upgraded unserscore version from 1.1.7 to 1.2.2 and underscore.string from 1.1.6 to 1.2.0
WARNING: underscore string does not mixin to underscore by default. Use _.str.* bzr revid: fme@openerp.com-20111115123059-k31lhp0db2d8h22k
Diffstat (limited to 'addons/web/static/src/js/core.js')
-rw-r--r--addons/web/static/src/js/core.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 369e1191665..f77f9bf1041 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -716,7 +716,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
if (parseInt(cookie_val, 10) !== token) { continue; }
// clear cookie
- document.cookie = _.sprintf("%s=;expires=%s;path=/",
+ document.cookie = _.str.sprintf("%s=;expires=%s;path=/",
cookie_name, new Date().toGMTString());
if (options.success) { options.success(); }
complete();
@@ -1055,7 +1055,7 @@ openerp.web.qweb.format_text_node = function(s) {
if (translation && translation.value === 'off') {
return s;
}
- var ts = _.trim(s);
+ var ts = _.str.trim(s);
if (ts.length === 0) {
return s;
}