diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-09-02 11:22:11 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-11-05 15:27:59 +0100 |
| commit | ef886aed2f4c7d9b78123d1cd980a899bf6b20ea (patch) | |
| tree | 0a51dc66a9ac12d898116721cc990882eb4588b0 /addons/web/static/src/js/core.js | |
| parent | 893d7fa8643192aec817478effa44c55d3c1ebc4 (diff) | |
[FIX] web: remove datejs and replace by momentjs
Diffstat (limited to 'addons/web/static/src/js/core.js')
| -rw-r--r-- | addons/web/static/src/js/core.js | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index df810bb67b9..ca13482caa8 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -328,13 +328,6 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ }).done(function() { self.on_modules_loaded(); self.trigger('module_loaded'); - if (!Date.CultureInfo.pmDesignator) { - // If no am/pm designator is specified but the openerp - // datetime format uses %i, date.js won't be able to - // correctly format a date. See bug#938497. - Date.CultureInfo.amDesignator = 'AM'; - Date.CultureInfo.pmDesignator = 'PM'; - } }); }); }, @@ -633,6 +626,7 @@ instance.web._lt = function (s) { instance.web.qweb.debug = instance.session.debug; _.extend(instance.web.qweb.default_dict, { '__debug__': instance.session.debug, + 'moment': function(date) { return new moment(date); }, }); instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node |