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

Remove message views when messages get reset

Browse Source
This commit is contained in:
JC Brand 2019-05-21 09:56:27 +02:00
parent b4b7fedf0f
commit bb0c0fcd81
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/converse-chatview.js
View File

@ -339,7 +339,10 @@ converse.plugins.add('converse-chatview', {
this.initDebounced();
this.model.messages.on('add', this.onMessageAdded, this);
this.model.messages.on('rendered', this.scrollDown, this);
this.model.messages.on('reset', () => (this.content.innerHTML = ''));
this.model.messages.on('reset', () => {
this.content.innerHTML = '';
this.removeAll();
});
this.model.on('show', this.show, this);
this.model.on('destroy', this.remove, this);

3
src/converse-mam-views.js
View File

@ -152,7 +152,7 @@ converse.plugins.add('converse-mam-views', {
*/
const { _converse } = this;
/* Event handlers */
/************************ BEGIN Event Handlers ************************/
_converse.api.listen.on('afterMessagesFetched', chatbox => chatbox.fetchNewestMessages());
_converse.api.listen.on('reconnected', () => {
@ -161,5 +161,6 @@ converse.plugins.add('converse-mam-views', {
);
_.each(private_chats, view => view.model.fetchNewestMessages())
});
/************************ END Event Handlers ************************/
}
});

5
src/converse-muc-views.js
View File

@ -541,7 +541,10 @@ converse.plugins.add('converse-muc-views', {
this.model.messages.on('add', this.onMessageAdded, this);
this.model.messages.on('rendered', this.scrollDown, this);
this.model.messages.on('reset', () => (this.content.innerHTML = ''));
this.model.messages.on('reset', () => {
this.content.innerHTML = '';
this.removeAll();
});
this.model.on('change:affiliation', this.renderHeading, this);
this.model.on('change:connection_status', this.onConnectionStatusChanged, this);

2
src/headless/converse-chatboxes.js
View File

@ -301,7 +301,6 @@ converse.plugins.add('converse-chatboxes', {
this.messages.browserStorage = new Backbone.BrowserStorage.session(
`converse.messages-${this.get('jid')}-${_converse.bare_jid}`);
this.messages.chatbox = this;
this.messages.fetched = u.getResolveablePromise();
this.messages.on('change:upload', (message) => {
if (message.get('upload') === _converse.SUCCESS) {
@ -323,6 +322,7 @@ converse.plugins.add('converse-chatboxes', {
},
fetchMessages () {
this.messages.fetched = u.getResolveablePromise();
const resolve = this.messages.fetched.resolve;
this.messages.fetch({
'add': true,

5
src/headless/converse-muc.js
View File

@ -216,8 +216,8 @@ converse.plugins.add('converse-muc', {
this.initFeatures();
this.initOccupants();
this.initMessages();
this.registerHandlers();
this.initMessages();
},
async onConnectionStatusChanged () {
@ -1532,10 +1532,11 @@ converse.plugins.add('converse-muc', {
*/
_converse.chatboxes
.filter(m => (m.get('type') === _converse.CHATROOMS_TYPE))
.forEach(m => m.save('connection_status', converse.ROOMSTATUS.DISCONNECTED))
.forEach(room => {
room.save('connection_status', converse.ROOMSTATUS.DISCONNECTED);
room.clearMessages();
room.registerHandlers();
room.fetchMessages();
room.join();
});
}