Merge pull request #636 from jitsi/fix_externalConnectUrl_param

Fixes issue with externalConnectUrl hash param when the value is null
This commit is contained in:
George Politis
2016-04-29 11:47:44 -05:00
2 changed files with 6 additions and 3 deletions
@@ -17,8 +17,11 @@
*/
(function () {
var params = getConfigParamsFromUrl();
var url = params["config.externalConnectUrl"] || config.externalConnectUrl;
//Url params have higher proirity than config params
var url = config.externalConnectUrl;
if(params.hasOwnProperty('config.externalConnectUrl'))
url = params["config.externalConnectUrl"];
/**
* Check if connect from connection.js was executed and executes the handler
+1 -1
View File
@@ -130,7 +130,7 @@ function processMessage(event) {
*/
function isEnabled () {
let hash = location.hash;
return hash && hash.indexOf("external") > -1 && window.postMessage;
return hash && hash.indexOf("external=true") > -1 && window.postMessage;
}
/**