extract auth domain to settings
This commit is contained in:
parent
cfaa233542
commit
570444dab8
2
app.js
2
app.js
|
@ -38,7 +38,7 @@ function init() {
|
|||
|
||||
APP.desktopsharing.init();
|
||||
APP.RTC.start();
|
||||
APP.xmpp.start();
|
||||
APP.xmpp.start(APP.settings.getJid(), null);
|
||||
APP.statistics.start();
|
||||
APP.connectionquality.init();
|
||||
APP.keyboardshortcut.init();
|
||||
|
|
|
@ -95,7 +95,17 @@ var Settings = {
|
|||
setLanguage: function (lang) {
|
||||
language = lang;
|
||||
window.localStorage.language = lang;
|
||||
},
|
||||
getJid: function() {
|
||||
var configDomain = config.hosts.anonymousdomain || config.hosts.domain;
|
||||
// Force authenticated domain if room is appended with '?login=true'
|
||||
if (config.hosts.anonymousdomain &&
|
||||
window.location.search.indexOf("login=true") !== -1) {
|
||||
configDomain = config.hosts.domain;
|
||||
}
|
||||
var jid = configDomain || window.location.hostname;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
module.exports = Settings;
|
||||
|
|
|
@ -295,7 +295,7 @@ var XMPP = {
|
|||
* @type {boolean}
|
||||
*/
|
||||
forceMuted: false,
|
||||
start: function () {
|
||||
start: function (jid, password) {
|
||||
setupEvents();
|
||||
initStrophePlugins();
|
||||
registerListeners();
|
||||
|
|
Loading…
Reference in New Issue