diff options
| author | Jérome Maes <jem@openerp.com> | 2014-11-18 11:35:28 +0100 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2014-11-18 11:35:28 +0100 |
| commit | 7a7bf11e92ffdd2de06e444ddc77aeb528ed4764 (patch) | |
| tree | 5f7b1650659143286182169825d3e4101a32fbd6 | |
| parent | 171948a2b6af8a74f90f42f6d1dae367507df23c (diff) | |
[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().
| -rw-r--r-- | addons/im_chat/static/src/js/im_chat.js | 3 | ||||
| -rw-r--r-- | 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 @@ <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="moment(date).format('LL')"/> + <t t-esc="window.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="moment((_.last(messages).create_date)).format('LT')"/></div> + <div class="oe_im_chatview_time"><t t-esc="window.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)).format('LT')"/></div> + <div class="oe_im_chatview_time"><t t-esc="window.moment((_.last(messages).create_date)).format('LT')"/></div> </div> </t> |