haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #357 from jitsi/fix-connect 

Tries to fix connecting after XMPP authentication is requested.
This commit is contained in:
bgrozev 2015-09-16 00:35:49 -05:00
parent 2740041a82 745417be18
commit 9c4b69a1ba
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/UI/UI.js
View File

@ -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) {

2
modules/xmpp/xmpp.js
View File

@ -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;