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-23 10:37:08 -04:00
parent dd6a21191a
commit 58ff70717e
1 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1635,24 +1635,13 @@ Metamaps.Realtime = {
$('#mapper' + data.userid).remove(); $('#mapper' + data.userid).remove();
$('.realtimeMapperList ul').append(mapperListItem); $('.realtimeMapperList ul').append(mapperListItem);
<<<<<<< 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/>', {
id: 'compass' + data.userid, id: 'compass' + data.userid,
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
$('#compass' + data.userid).remove();
$('<div/>', {
id: 'compass' + data.userid,
text: data.username,
class: 'collabCompass'
}).appendTo('#wrapper');
} }
>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
}, },
newPeerOnMap: function (data) { newPeerOnMap: function (data) {
var self = Metamaps.Realtime; var self = Metamaps.Realtime;
@ -1669,7 +1658,7 @@ Metamaps.Realtime = {
}; };
// create an item for them in the realtime box // create an item for them in the realtime box
<<<<<<< HEAD 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" />';
mapperListItem += data.username; mapperListItem += data.username;
@ -1687,36 +1676,6 @@ Metamaps.Realtime = {
Metamaps.GlobalUI.notifyUser(data.username + ' just joined the map'); Metamaps.GlobalUI.notifyUser(data.username + ' just joined the map');
// send this new mapper back your details, and the awareness that you've loaded the map
var update = {
userToNotify: data.userid,
username: Metamaps.Active.Mapper.get("name"),
userimage: Metamaps.Active.Mapper.get("image"),
userid: Metamaps.Active.Mapper.id,
userrealtime: self.status,
mapid: Metamaps.Active.Map.id
};
socket.emit('updateNewMapperList', update);
=======
if (data.userid !== Metamaps.Active.Mapper.id) {
var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
mapperListItem += data.username;
mapperListItem += '<div class="littleJuntoIcon"></div>';
mapperListItem += '</li>';
$('#mapper' + data.userid).remove();
$('.realtimeMapperList ul').append(mapperListItem);
// create a div for the collaborators compass
$('#compass' + data.userid).remove();
$('<div/>', {
id: 'compass' + data.userid,
text: data.username,
class: 'collabCompass'
}).appendTo('#wrapper');
Metamaps.GlobalUI.notifyUser(data.username + ' just joined the map');
// send this new mapper back your details, and the awareness that you've loaded the map // send this new mapper back your details, and the awareness that you've loaded the map
var update = { var update = {
userToNotify: data.userid, userToNotify: data.userid,
@ -1728,7 +1687,6 @@ Metamaps.Realtime = {
}; };
socket.emit('updateNewMapperList', update); socket.emit('updateNewMapperList', update);
} }
>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
}, },
lostPeerOnMap: function (data) { lostPeerOnMap: function (data) {
var self = Metamaps.Realtime; var self = Metamaps.Realtime;