From 2e7cafd5a22706b289aa0865a8059d3741c76600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Thu, 13 Nov 2014 11:28:13 +0100
Subject: [PATCH] [FIX] im_chat : fix undefined functions (momentjs and
 im_chat.js)

---
 addons/im_chat/static/src/js/im_chat.js   | 2 --
 addons/im_chat/static/src/xml/im_chat.xml | 4 ++--
 2 files changed, 2 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 d252a5cfe27..dd7d92a90bb 100644
--- a/addons/im_chat/static/src/js/im_chat.js
+++ b/addons/im_chat/static/src/js/im_chat.js
@@ -342,8 +342,6 @@
                 if(!m.from_id){
                     m.from_id = [false, get_anonymous_name()];
                 }
-                m.message = self.escape_keep_url(m.message);
-                m.message = self.smiley(m.message);
                 m.create_date = moment.utc(m.create_date).format('YYYY-MM-DD HH:mm:ss');
                 return m;
             });
diff --git a/addons/im_chat/static/src/xml/im_chat.xml b/addons/im_chat/static/src/xml/im_chat.xml
index bf8b5bd6b84..aa19b72b27b 100644
--- a/addons/im_chat/static/src/xml/im_chat.xml
+++ b/addons/im_chat/static/src/xml/im_chat.xml
@@ -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="moment((_.last(messages).create_date)).parse('LT')"/></div>
+        <div class="oe_im_chatview_time"><t t-esc="moment((_.last(messages).create_date)).format('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="moment((_.last(messages).create_date)).parse('LT')"/></div>
+        <div class="oe_im_chatview_time"><t t-esc="moment((_.last(messages).create_date)).format('LT')"/></div>
     </div>
 </t>