From 7a7bf11e92ffdd2de06e444ddc77aeb528ed4764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Tue, 18 Nov 2014 11:35:28 +0100 Subject: [PATCH] [FIX] im_chat : momentjs undefined on external pages. Temporary fix by replacing moment() by window.moment(). The moment helper is defined in core.js, which is not imported in web_assets common. If refactoring, the dates will be pre-process in render_messages(). --- addons/im_chat/static/src/js/im_chat.js | 3 +++ addons/im_chat/static/src/xml/im_chat.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js index dd7d92a90bb..78ed6778a1f 100644 --- a/addons/im_chat/static/src/js/im_chat.js +++ b/addons/im_chat/static/src/js/im_chat.js @@ -373,6 +373,9 @@ } }); // render and set the content of the chatview + // TODO jem : when refactoring this, don't forget to pre-process date in this function before render quweb template + // since, moment will not be define in qweb on the website pages, because the helper (see csn) is in core.js and cannot be + // imported in the frontend. this.$('.oe_im_chatview_content_bubbles').html($(openerp.qweb.render("im_chat.Conversation_content", {"list": res}))); this._go_bottom(); }, diff --git a/addons/im_chat/static/src/xml/im_chat.xml b/addons/im_chat/static/src/xml/im_chat.xml index aa19b72b27b..cc94f587b38 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 @@
- +
@@ -56,7 +56,7 @@
-
+
@@ -67,7 +67,7 @@
-
+