glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to https for sockets

Browse source
This commit is contained in:
Connor Turland 2015-12-11 18:45:51 -05:00
parent 92ddbbaf4f
commit 6c7ba76937
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/src/Metamaps.js.erb
View file

@ -1909,7 +1909,7 @@ Metamaps.Util = {
Metamaps.Realtime = {
stringForLocalhost: 'http://' + location.host.split(':')[0] + ':5001',
stringForMetamaps: 'http://metamaps.cc:5001',
stringForHeroku: 'http://gentle-savannah-1303.herokuapp.com',
stringForHeroku: 'https://gentle-savannah-1303.herokuapp.com',
videoId: 'video-wrapper',
socket: null,
webrtc: null,
@ -1945,6 +1945,7 @@ Metamaps.Realtime = {
var whichToConnect = railsEnv === 'development' ? self.stringForLocalhost : self.stringForHeroku;
self.socket = new SocketIoConnection({ url: whichToConnect });
self.socket.on('connect', function () {
console.log('connected');
self.startActiveMap();
});
self.webrtc = new SimpleWebRTC({