Merge branch 'master' of github.com:jcbrand/converse.js

This commit is contained in:
JC Brand 2014-11-08 15:35:51 +01:00
commit eeec4ebc76

View File

@ -72,7 +72,7 @@ Strophe.addConnectionPlugin('roster',
oldCallback.apply(this, arguments); oldCallback.apply(this, arguments);
} }
}; };
conn.connect = function(jid, pass, callback, wait, hold) conn.connect = function(jid, pass, callback, wait, hold, route)
{ {
oldCallback = callback; oldCallback = callback;
if (typeof jid == "undefined") if (typeof jid == "undefined")
@ -80,7 +80,7 @@ Strophe.addConnectionPlugin('roster',
if (typeof pass == "undefined") if (typeof pass == "undefined")
pass = null; pass = null;
callback = newCallback; callback = newCallback;
_connect.apply(conn, [jid, pass, callback, wait, hold]); _connect.apply(conn, [jid, pass, callback, wait, hold, route]);
}; };
conn.attach = function(jid, sid, rid, callback, wait, hold, wind) conn.attach = function(jid, sid, rid, callback, wait, hold, wind)
{ {