summaryrefslogtreecommitdiff
path: root/addons/im_chat/static/src/js
diff options
context:
space:
mode:
authorCedric Snauwaert <csn@openerp.com>2014-09-02 11:22:11 +0200
committerFabien Meghazi <fme@openerp.com>2014-11-05 15:27:59 +0100
commitef886aed2f4c7d9b78123d1cd980a899bf6b20ea (patch)
tree0a51dc66a9ac12d898116721cc990882eb4588b0 /addons/im_chat/static/src/js
parent893d7fa8643192aec817478effa44c55d3c1ebc4 (diff)
[FIX] web: remove datejs and replace by momentjs
Diffstat (limited to 'addons/im_chat/static/src/js')
-rw-r--r--addons/im_chat/static/src/js/im_chat.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js
index 0d27e5cbab4..4ba21492dc4 100644
--- a/addons/im_chat/static/src/js/im_chat.js
+++ b/addons/im_chat/static/src/js/im_chat.js
@@ -342,7 +342,9 @@
if(!m.from_id){
m.from_id = [false, get_anonymous_name()];
}
- m.create_date = Date.parse(m.create_date).setTimezone("UTC").toString("yyyy-MM-dd HH:mm:ss");
+ m.message = self.escape_keep_url(m.message);
+ m.message = self.smiley(m.message);
+ m.create_date = new moment(m.create_date).format('L HH:mm:ss');
return m;
});
this.set("messages", _.sortBy(this.get("messages").concat(messages), function(m){ return m.id; }));