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/im_chat/static | |
| parent | 893d7fa8643192aec817478effa44c55d3c1ebc4 (diff) | |
[FIX] web: remove datejs and replace by momentjs
Diffstat (limited to 'addons/im_chat/static')
| -rw-r--r-- | addons/im_chat/static/src/js/im_chat.js | 4 | ||||
| -rw-r--r-- | addons/im_chat/static/src/xml/im_chat.xml | 6 |
2 files changed, 6 insertions, 4 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; })); diff --git a/addons/im_chat/static/src/xml/im_chat.xml b/addons/im_chat/static/src/xml/im_chat.xml index 5370635ab59..bf8b5bd6b84 100644 --- a/addons/im_chat/static/src/xml/im_chat.xml +++ b/addons/im_chat/static/src/xml/im_chat.xml @@ -29,7 +29,7 @@ <t t-name="im_chat.Conversation_content"> <t t-foreach="_.keys(list)" t-as="date"> <div class="oe_im_chatview_date_separator"> - <t t-esc="Date.parse(date).toString(Date.CultureInfo.formatPatterns.longDate)"/> + <t t-esc="moment(date).format('LL')"/> </div> <t t-foreach="list[date]" t-as="bubble"> <t t-if="bubble[0].type === 'message'"> @@ -56,7 +56,7 @@ <div class="oe_im_chatview_bubble_item"><t t-raw="m.message"/></div> </t> </div> - <div class="oe_im_chatview_time"><t t-esc="Date.parse((_.last(messages).create_date)).toString('HH:mm')"/></div> + <div class="oe_im_chatview_time"><t t-esc="moment((_.last(messages).create_date)).parse('LT')"/></div> </div> </t> <t t-name="im_chat.Conversation_technical_bubble"> @@ -67,7 +67,7 @@ <div><t t-raw="m.message"/></div> </t> </div> - <div class="oe_im_chatview_time"><t t-esc="Date.parse((_.last(messages).create_date)).toString('HH:mm')"/></div> + <div class="oe_im_chatview_time"><t t-esc="moment((_.last(messages).create_date)).parse('LT')"/></div> </div> </t> |