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

Don't try to reconnect on auth fail.

Browse Source
This commit is contained in:
JC Brand 2016-04-13 11:59:09 +00:00
parent e09328df6a
commit a969d010cb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/source/development.rst
View File

@ -873,6 +873,13 @@ When a chat buddy's custom status message has changed.
``converse.listen.on('contactStatusMessageChanged', function (event, data) { ... });``
disconnected
~~~~~~~~~~~~
After converse.js has disconnected from the XMPP server.
``converse.listen.on('disconnected', function (event) { ... });``
initialized
~~~~~~~~~~~

11
src/converse-core.js
View File

@ -440,15 +440,11 @@
this.onDisconnected = function (condition) {
if (!converse.auto_reconnect) { return; }
if (converse.disconnection_cause === Strophe.Status.CONNFAIL ||
(converse.disconnection_cause === Strophe.Status.AUTHFAIL &&
converse.credentials_url &&
!converse.logged_out
)
) {
if (converse.disconnection_cause === Strophe.Status.CONNFAIL) {
converse.reconnect(condition);
return 'reconnecting';
} else {
converse.emit('disconnected');
return 'disconnected';
}
};
@ -551,7 +547,6 @@
};
this.logOut = function () {
converse.auto_login = false;
converse.chatboxviews.closeAllChatBoxes();
converse.clearSession();
if (typeof converse.connection !== 'undefined') {
@ -1650,7 +1645,7 @@
this.autoLogin = function (credentials) {
if (credentials) {
// If passed in, then they come from login_credentials, so we
// If passed in, then they come from credentials_url, so we
// set them on the converse object.
this.jid = credentials.jid;
this.password = credentials.password;