Commit 84cd2ced authored by Steve Johnson's avatar Steve Johnson

fixed bridge urls in url.js to use config.json

parent a877d53b
......@@ -160,9 +160,6 @@ var Url = (function() {
if (config.wsBridgeURL) {
return config.wsBridgeURL;
}
else if (baseUrl.indexOf("localhost") >= 0 || baseUrl.indexOf("http://10.") == 0) {
return "ws://html5.cablelabs.com:1339";
}
else {
return "ws://" + document.location.host + ':1338';
}
......@@ -170,16 +167,10 @@ var Url = (function() {
obj.wssBridge = function() {
// temp - chromecast cannot load self signed SSL certs, so we can only use html.cablelabs.com
return "wss://html5.cablelabs.com:1339";
//return "ws://shareddom.ws:1338";
// Note: for localhost testing, you MUST specify an SSL host in the config file!
if (config.wssBridgeURL) {
return config.wssBridgeURL;
}
else if (baseUrl.indexOf("localhost") >= 0 || baseUrl.indexOf("http://10.") == 0) {
return "wss://shareddom.ws:1339";
}
else {
return "wss://" + document.location.host + ':1339';
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment