Commit d49adc93 authored by JC Brand's avatar JC Brand

Doesn't look like its necessary to call initConnection again

parent c25de7bd
...@@ -627,7 +627,6 @@ ...@@ -627,7 +627,6 @@
}; };
this.initStatus = (reconnecting) => { this.initStatus = (reconnecting) => {
// If there's no xmppstatus obj, then we were never connected to // If there's no xmppstatus obj, then we were never connected to
// begin with, so we set reconnecting to false. // begin with, so we set reconnecting to false.
reconnecting = _.isUndefined(_converse.xmppstatus) ? false : reconnecting; reconnecting = _.isUndefined(_converse.xmppstatus) ? false : reconnecting;
...@@ -1791,6 +1790,8 @@ ...@@ -1791,6 +1790,8 @@
}; };
this.initConnection = function () { this.initConnection = function () {
/* Creates a new Strophe.Connection instance if we don't already have one.
*/
if (!this.connection) { if (!this.connection) {
if (!this.bosh_service_url && ! this.websocket_url) { if (!this.bosh_service_url && ! this.websocket_url) {
throw new Error("initConnection: you must supply a value for either the bosh_service_url or websocket_url or both."); throw new Error("initConnection: you must supply a value for either the bosh_service_url or websocket_url or both.");
...@@ -1927,7 +1928,6 @@ ...@@ -1927,7 +1928,6 @@
return _converse.connection.jid; return _converse.connection.jid;
}, },
'login' (credentials) { 'login' (credentials) {
_converse.initConnection();
_converse.logIn(credentials); _converse.logIn(credentials);
}, },
'logout' () { 'logout' () {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment