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

Fixes authentication issues.

This commit is contained in:
hristoterezov 2015-01-29 11:09:09 +02:00
parent e766bad4ce
commit 98d1ca8505
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/UI/toolbars/Toolbar.js
View File

@ -239,7 +239,7 @@ var Toolbar = (function (my) {
// Open popup with authentication URL // Open popup with authentication URL
var authenticationWindow = Authentication.createAuthenticationWindow(function () { var authenticationWindow = Authentication.createAuthenticationWindow(function () {
// On popup closed - retry room allocation // On popup closed - retry room allocation
xAPP.mpp.allocateConferenceFocus(APP.UI.getRoomName(), APP.UI.checkForNicknameAndJoin); APP.xmpp.allocateConferenceFocus(APP.UI.getRoomName(), APP.UI.checkForNicknameAndJoin);
}, url); }, url);
if (!authenticationWindow) { if (!authenticationWindow) {
Toolbar.showAuthenticateButton(true); Toolbar.showAuthenticateButton(true);

2
modules/xmpp/xmpp.js
View File

@ -151,7 +151,7 @@ var XMPP = {
setupEvents(); setupEvents();
initStrophePlugins(); initStrophePlugins();
registerListeners(); registerListeners();
Moderator.init(); Moderator.init(this, eventEmitter);
var configDomain = config.hosts.anonymousdomain || config.hosts.domain; var configDomain = config.hosts.anonymousdomain || config.hosts.domain;
// Force authenticated domain if room is appended with '?login=true' // Force authenticated domain if room is appended with '?login=true'
if (config.hosts.anonymousdomain && if (config.hosts.anonymousdomain &&