diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-05-03 15:18:28 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2016-05-04 15:06:20 +0200 |
| commit | 7ded5370f16d3b0b7578cda24ef07e0c6d7d5cda (patch) | |
| tree | 8da5e4104b58e7ec70638c7cfa40f7ee254ff235 /addons/mail/static/src | |
| parent | 80e83f17d4e0c110ebace7c39462fda7bf88e4c0 (diff) | |
[REF] mail,web: unique Spinner template in base.xml
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/chatter.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/systray.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/chatter.xml | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/systray.xml | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js index 5e2e525f9b4..cbcaa9deb44 100644 --- a/addons/mail/static/src/js/chatter.js +++ b/addons/mail/static/src/js/chatter.js @@ -354,7 +354,7 @@ var Chatter = form_common.AbstractField.extend({ // Empty thread and display a spinner after 1s to indicate that it is loading this.thread.$el.empty(); web_utils.reject_after(web_utils.delay(1000), fetch_def).then(function () { - self.thread.$el.append(QWeb.render('mail.ChatterSpinner', {})); + self.thread.$el.append(QWeb.render('Spinner')); }); return fetch_def.then(function (raw_messages) { diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js index cdc6cf4e682..b3514e4ccb4 100644 --- a/addons/mail/static/src/js/systray.js +++ b/addons/mail/static/src/js/systray.js @@ -84,7 +84,7 @@ var MessagingMenu = Widget.extend({ var self = this; // Display spinner while waiting for channels preview - this.$channels_preview.html(QWeb.render('mail.chat.Spinner')); + this.$channels_preview.html(QWeb.render('Spinner')); chat_manager.is_ready.then(function () { var channels = _.filter(chat_manager.get_channels(), function (channel) { diff --git a/addons/mail/static/src/xml/chatter.xml b/addons/mail/static/src/xml/chatter.xml index 20df7a52e9c..22931689bde 100644 --- a/addons/mail/static/src/xml/chatter.xml +++ b/addons/mail/static/src/xml/chatter.xml @@ -64,8 +64,4 @@ </div> </t> - <t t-name="mail.ChatterSpinner"> - <div class="o_spinner"> <span class="fa fa-spinner fa-spin"/> </div> - </t> - </templates> diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index 4a987fdf992..790d70c0ee6 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -52,9 +52,5 @@ </t> </t> - <t t-name="mail.chat.Spinner"> - <div class="o_spinner"> <i class="fa fa-spinner fa-spin"/> </div> - </t> - </templates> |