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

Proper MUC reconnection is handled in converse-muc-views

Browse Source
This commit is contained in:
JC Brand 2018-06-05 13:01:47 +02:00
parent ca9d53a653
commit a3fe6162c1
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev.html
View File

@ -32,8 +32,8 @@
notify_all_room_messages: [
'discuss@conference.conversejs.org'
],
bosh_service_url: 'http://chat.example.org:5280/http-bind/',
// bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
// bosh_service_url: 'http://chat.example.org:5280/http-bind/',
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
message_archiving: 'always',
debug: true
});

32
dist/converse.js vendored
View File

@ -62062,13 +62062,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
return this.__super__.disconnect.apply(this, arguments);
},
logOut: function logOut() {
const _converse = this.__super__._converse;
_converse.chatboxviews.closeAllChatBoxes();
return this.__super__.logOut.apply(this, arguments);
},
initStatus: function initStatus(reconnecting) {
const _converse = this.__super__._converse;
@ -62631,11 +62624,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
},
onConnected() {
this.browserStorage = new Backbone.BrowserStorage[_converse.storage](b64_sha1(`converse.chatboxes-${_converse.bare_jid}`));
this.browserStorage = new Backbone.BrowserStorage.session(b64_sha1(`converse.chatboxes-${_converse.bare_jid}`));
this.registerMessageHandler();
this.fetch({
add: true,
success: this.onChatBoxesFetched.bind(this)
'add': true,
'success': this.onChatBoxesFetched.bind(this)
});
},
@ -62930,11 +62923,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
_converse.emit('chatBoxesInitialized');
});
_converse.api.listen.on('beforeTearDown', () => {
_converse.chatboxes.remove(); // Don't call off(), events won't get re-registered upon reconnect.
delete _converse.chatboxes.browserStorage;
_converse.api.listen.on('logout', () => {
_converse.chatboxviews.closeAllChatBoxes();
});
_converse.api.listen.on('presencesInitialized', () => _converse.chatboxes.onConnected());
@ -72212,14 +72202,14 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
const vcards = [];
if (this.get('jid')) {
vcards.push(this.updateVCard(_converse.vcards.findWhere({
vcards.push(_converse.vcards.findWhere({
'jid': this.get('jid')
})));
}));
}
vcards.push(this.updateVCard(_converse.vcards.findWhere({
vcards.push(_converse.vcards.findWhere({
'jid': this.get('from')
})));
}));
_.forEach(_.filter(vcards, undefined), vcard => {
if (hash && vcard.get('image_hash') !== hash) {
@ -72413,7 +72403,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}
function disconnectChatRooms() {
/* When disconnecting, or reconnecting, mark all chat rooms as
/* When disconnecting, mark all chat rooms as
* disconnected, so that they will be properly entered again
* when fetched from session storage.
*/
@ -72439,8 +72429,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
_converse.on('chatBoxesFetched', autoJoinRooms);
_converse.on('reconnecting', disconnectChatRooms);
_converse.on('disconnecting', disconnectChatRooms);
/************************ END Event Handlers ************************/

4
src/converse-chatboxes.js
View File

@ -567,8 +567,8 @@
b64_sha1(`converse.chatboxes-${_converse.bare_jid}`));
this.registerMessageHandler();
this.fetch({
add: true,
success: this.onChatBoxesFetched.bind(this)
'add': true,
'success': this.onChatBoxesFetched.bind(this)
});
},

3
src/converse-muc.js
View File

@ -1172,7 +1172,7 @@
}
function disconnectChatRooms () {
/* When disconnecting, or reconnecting, mark all chat rooms as
/* When disconnecting, mark all chat rooms as
* disconnected, so that they will be properly entered again
* when fetched from session storage.
*/
@ -1193,7 +1193,6 @@
}
});
_converse.on('chatBoxesFetched', autoJoinRooms);
_converse.on('reconnecting', disconnectChatRooms);
_converse.on('disconnecting', disconnectChatRooms);
/************************ END Event Handlers ************************/