From a3dc23bf3e8d03ba3510dfdbd70c0545f8af3556 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 7 Oct 2013 21:35:52 +0200 Subject: [PATCH] Bugfix. When trying to reconnect: 'connection' is not defined. Conflicts: converse.js --- converse.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/converse.js b/converse.js index 4d1380aee..b7dccadf7 100644 --- a/converse.js +++ b/converse.js @@ -201,7 +201,11 @@ $button = $form.find('input[type=submit]'); if ($button) { $button.show().siblings('span').remove(); } converse.giveFeedback(__('Disconnected'), 'error'); - converse.connection.connect(connection.jid, connection.pass, converse.onConnect); + converse.connection.connect( + converse.connection.jid, + converse.connection.pass, + converse.onConnect + ); } else if (status === Strophe.Status.Error) { $form = $('#converse-login'); $button = $form.find('input[type=submit]'); @@ -219,6 +223,11 @@ converse.giveFeedback(__('Authentication Failed'), 'error'); } else if (status === Strophe.Status.DISCONNECTING) { converse.giveFeedback(__('Disconnecting'), 'error'); + converse.connection.connect( + converse.connection.jid, + converse.connection.pass, + converse.onConnect + ); } else if (status === Strophe.Status.ATTACHED) { converse.log('Attached'); converse.onConnected(); @@ -359,9 +368,7 @@ this.connection.xmlInput = function (body) { console.log(body); }; this.connection.xmlOutput = function (body) { console.log(body); }; Strophe.log = function (level, msg) { console.log(level+' '+msg); }; - Strophe.error = function (msg) { - console.log('ERROR: '+msg); - }; + Strophe.error = function (msg) { console.log('ERROR: '+msg); }; } this.bare_jid = Strophe.getBareJidFromJid(this.connection.jid); this.domain = Strophe.getDomainFromJid(this.connection.jid);