Merge pull request #357 from jitsi/fix-connect

Tries to fix connecting after XMPP authentication is requested.

modules/UI/UI.js

@@ -311,12 +311,9 @@ function registerListeners() {
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function () {
         messageHandler.showError();
     });
-    APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function () {
+    APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function (callback) {
         // FIXME: re-use LoginDialog which supports retries
-        // FIXME^2: This looks like a bug...connect is undefined.
-        /* jshint -W117 */
-        UI.showLoginPopup(connect);
-        /* jshint +W117 */
+        UI.showLoginPopup(callback);
     });
 
     APP.xmpp.addListener(XMPPEvents.FOCUS_DISCONNECTED, function (focusComponent, retrySec) {

modules/xmpp/xmpp.js

@@ -306,7 +306,7 @@ var XMPP = {
         return Strophe.getStatusString(status);
     },
     promptLogin: function () {
-        eventEmitter.emit(XMPPEvents.PROMPT_FOR_LOGIN);
+        eventEmitter.emit(XMPPEvents.PROMPT_FOR_LOGIN, connect);
     },
     joinRoom: function(roomName, useNicks, nick) {
         var roomjid = roomName;