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

chat only displays on maps

Browse source
This commit is contained in:
Connor Turland 2016-01-26 14:46:26 +13:00
parent b80fabcbcf
commit 1fa84e0d29
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1989,7 +1989,8 @@ Metamaps.Realtime = {
}); });
self.room.videoAdded(self.handleVideoAdded); self.room.videoAdded(self.handleVideoAdded);
self.createChat(); self.room.chat.$container.hide();
$('body').prepend(self.room.chat.$container);
} // if Metamaps.Active.Mapper } // if Metamaps.Active.Mapper
}, },
addJuntoListeners: function () { addJuntoListeners: function () {
@ -2064,6 +2065,7 @@ Metamaps.Realtime = {
$(".collabCompass").remove(); $(".collabCompass").remove();
self.status = false; self.status = false;
self.room.leave(); self.room.leave();
self.room.chat.$container.hide();
self.videosInPosition = 1; self.videosInPosition = 1;
}, },
reenableRealtime: function() { reenableRealtime: function() {
@ -2086,6 +2088,7 @@ Metamaps.Realtime = {
self.status = true; self.status = true;
//$(".sidebarCollaborateIcon").addClass("blue"); //$(".sidebarCollaborateIcon").addClass("blue");
$(".collabCompass").show(); $(".collabCompass").show();
self.room.chat.$container.show();
self.room.room = 'map-' + Metamaps.Active.Map.id; self.room.room = 'map-' + Metamaps.Active.Map.id;
self.checkForACallToJoin(); self.checkForACallToJoin();
}, },
@ -2364,12 +2367,6 @@ Metamaps.Realtime = {
socket.on('mapChangeFromServer', self.mapChange); socket.on('mapChangeFromServer', self.mapChange);
}, },
createChat: function() {
var self = Metamaps.Realtime;
$('body').prepend(self.room.chat.$container);
//self.room.chat.open();
},
sendRealtimeOn: function () { sendRealtimeOn: function () {
var self = Metamaps.Realtime; var self = Metamaps.Realtime;
var socket = Metamaps.Realtime.socket; var socket = Metamaps.Realtime.socket;