Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Append spinner when fetching newer messages

Browse Source
This commit is contained in:
JC Brand 2017-12-02 14:57:10 +01:00
parent 4df61cc496
commit 063908e032
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/converse-chatview.js
View File

@ -294,7 +294,8 @@
unread_msgs: __('You have unread messages') unread_msgs: __('You have unread messages')
} }
)); ));
this.$content = this.$el.find('.chat-content'); this.content = this.el.querySelector('.chat-content');
this.$content = $(this.content);
return this; return this;
}, },
@ -360,20 +361,26 @@
if (!permanent) { if (!permanent) {
$el.addClass('chat-event'); $el.addClass('chat-event');
} }
this.$content.append($el); this.content.insertAdjacentElement('beforeend', $el[0]);
this.scrollDown(); this.scrollDown();
}, },
addSpinner () { addSpinner (append=false) {
if (_.isNull(this.el.querySelector('.spinner'))) { if (_.isNull(this.el.querySelector('.spinner'))) {
this.$content.prepend(tpl_spinner); if (append) {
this.content.insertAdjacentHTML('beforeend', tpl_spinner());
this.scrollDown();
} else {
this.content.insertAdjacentHTML('afterbegin', tpl_spinner());
}
} }
}, },
clearSpinner () { clearSpinner () {
if (this.$content.children(':first').is('span.spinner')) { _.each(
this.$content.children(':first').remove(); this.content.querySelectorAll('span.spinner'),
} (el) => el.parentNode.removeChild(el)
);
}, },
insertDayIndicator (date, prepend) { insertDayIndicator (date, prepend) {

3
src/converse-mam.js
View File

@ -61,8 +61,7 @@
*/ */
if (this.disable_mam) { return; } if (this.disable_mam) { return; }
const { _converse } = this.__super__; const { _converse } = this.__super__;
this.addSpinner(); this.addSpinner(true);
_converse.api.disco.supports(Strophe.NS.MAM, _converse.bare_jid).then( _converse.api.disco.supports(Strophe.NS.MAM, _converse.bare_jid).then(
(result) => { // Success (result) => { // Success
if (result.supported) { if (result.supported) {

3
src/converse-muc.js
View File

@ -489,7 +489,8 @@
})) }))
.append(this.occupantsview.$el); .append(this.occupantsview.$el);
this.renderToolbar(tpl_chatroom_toolbar); this.renderToolbar(tpl_chatroom_toolbar);
this.$content = this.$el.find('.chat-content'); this.content = this.el.querySelector('.chat-content');
this.$content = $(this.content);
} }
this.toggleOccupants(null, true); this.toggleOccupants(null, true);
return this; return this;