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

heroku

Browse source
This commit is contained in:
Connor Turland 2014-09-22 23:56:47 -04:00
parent c2340301fd
commit dd6a21191a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/src/Metamaps.js
View file

@ -1458,7 +1458,7 @@ Metamaps.Realtime = {
}); });
$('body').click(self.close); $('body').click(self.close);
self.socket = io.connect('http://localhost:5001'); self.socket = io.connect('http://gentle-savannah-1303.herokuapp.com');
self.startActiveMap(); self.startActiveMap();
}, },
toggleBox: function (event) { toggleBox: function (event) {
@ -1635,7 +1635,7 @@ Metamaps.Realtime = {
$('#mapper' + data.userid).remove(); $('#mapper' + data.userid).remove();
$('.realtimeMapperList ul').append(mapperListItem); $('.realtimeMapperList ul').append(mapperListItem);
<<<<<<< HEAD <<<<<<< HEAD
// create a div for the collaborators compass // create a div for the collaborators compass
$('#compass' + data.userid).remove(); $('#compass' + data.userid).remove();
$('<div/>', { $('<div/>', {
@ -1643,7 +1643,7 @@ Metamaps.Realtime = {
class: 'collabCompass' class: 'collabCompass'
}).html('<img width="28" height="28" src="'+data.userimage+'" /><p>'+data.username+'</p>').appendTo('#wrapper'); }).html('<img width="28" height="28" src="'+data.userimage+'" /><p>'+data.username+'</p>').appendTo('#wrapper');
======= =======
// create a div for the collaborators compass // create a div for the collaborators compass
$('#compass' + data.userid).remove(); $('#compass' + data.userid).remove();
$('<div/>', { $('<div/>', {
@ -1652,7 +1652,7 @@ Metamaps.Realtime = {
class: 'collabCompass' class: 'collabCompass'
}).appendTo('#wrapper'); }).appendTo('#wrapper');
} }
>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98 >>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
}, },
newPeerOnMap: function (data) { newPeerOnMap: function (data) {
var self = Metamaps.Realtime; var self = Metamaps.Realtime;
@ -1669,7 +1669,7 @@ Metamaps.Realtime = {
}; };
// create an item for them in the realtime box // create an item for them in the realtime box
<<<<<<< HEAD <<<<<<< HEAD
var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">'; var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />'; mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
mapperListItem += data.username; mapperListItem += data.username;
@ -1697,7 +1697,7 @@ Metamaps.Realtime = {
mapid: Metamaps.Active.Map.id mapid: Metamaps.Active.Map.id
}; };
socket.emit('updateNewMapperList', update); socket.emit('updateNewMapperList', update);
======= =======
if (data.userid !== Metamaps.Active.Mapper.id) { if (data.userid !== Metamaps.Active.Mapper.id) {
var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">'; var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />'; mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
@ -1728,7 +1728,7 @@ Metamaps.Realtime = {
}; };
socket.emit('updateNewMapperList', update); socket.emit('updateNewMapperList', update);
} }
>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98 >>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
}, },
lostPeerOnMap: function (data) { lostPeerOnMap: function (data) {
var self = Metamaps.Realtime; var self = Metamaps.Realtime;