Merge pull request #632 from jitsi/add-url-param-conn-opt
Add support for connection optimisation URL param
This commit is contained in:
commit
bd7740cba1
|
@ -12,23 +12,13 @@
|
||||||
* exrnal_connect.js.
|
* exrnal_connect.js.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the token from the URL.
|
|
||||||
*/
|
|
||||||
function buildToken(){
|
|
||||||
var params = getConfigParamsFromUrl();
|
|
||||||
return params["config.token"] || config.token;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes createConnectionExternally function.
|
* Executes createConnectionExternally function.
|
||||||
*/
|
*/
|
||||||
(function () {
|
(function () {
|
||||||
// FIXME: Add implementation for changing that config from the url for
|
var params = getConfigParamsFromUrl();
|
||||||
// consistency
|
|
||||||
var url = config.externalConnectUrl;
|
var url = params["config.externalConnectUrl"] || config.externalConnectUrl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if connect from connection.js was executed and executes the handler
|
* Check if connect from connection.js was executed and executes the handler
|
||||||
|
@ -64,7 +54,7 @@ function buildToken(){
|
||||||
|
|
||||||
url += "?room=" + room_name;
|
url += "?room=" + room_name;
|
||||||
|
|
||||||
var token = buildToken();
|
var token = params["config.token"] || config.token;
|
||||||
if(token)
|
if(token)
|
||||||
url += "&token=" + token;
|
url += "&token=" + token;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue