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

improvements to realtime

Browse source
This commit is contained in:
Connor Turland 2014-11-04 21:27:40 -05:00
parent c5907914e3
commit 2bbe2b8eff
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -1,6 +1,5 @@
Metamaps.JIT = { Metamaps.JIT = {
events: { events: {
mouseMove: 'Metamaps:JIT:events:mouseMove',
topicDrag: 'Metamaps:JIT:events:topicDrag', topicDrag: 'Metamaps:JIT:events:topicDrag',
newTopic: 'Metamaps:JIT:events:newTopic', newTopic: 'Metamaps:JIT:events:newTopic',
deleteTopic: 'Metamaps:JIT:events:deleteTopic', deleteTopic: 'Metamaps:JIT:events:deleteTopic',
@ -677,9 +676,6 @@ Metamaps.JIT = {
if (!node && !edge) { if (!node && !edge) {
$('canvas').css('cursor', 'default'); $('canvas').css('cursor', 'default');
} }
var pos = eventInfo.getPos();
$(document).trigger(Metamaps.JIT.events.mouseMove, [pos]);
}, // onMouseMoveHandler }, // onMouseMoveHandler
enterKeyHandler: function () { enterKeyHandler: function () {
var creatingMap = Metamaps.GlobalUI.lightbox; var creatingMap = Metamaps.GlobalUI.lightbox;
@ -781,7 +777,6 @@ Metamaps.JIT = {
// maps // maps
positionsToSend[topic.id] = pos; positionsToSend[topic.id] = pos;
$(document).trigger(Metamaps.JIT.events.topicDrag, [positionsToSend]); $(document).trigger(Metamaps.JIT.events.topicDrag, [positionsToSend]);
$(document).trigger(Metamaps.JIT.events.mouseMove, [pos]);
} }
} else { } else {
var len = Metamaps.Selected.Nodes.length; var len = Metamaps.Selected.Nodes.length;
@ -813,7 +808,6 @@ Metamaps.JIT = {
if (Metamaps.Active.Map) { if (Metamaps.Active.Map) {
$(document).trigger(Metamaps.JIT.events.topicDrag, [positionsToSend]); $(document).trigger(Metamaps.JIT.events.topicDrag, [positionsToSend]);
$(document).trigger(Metamaps.JIT.events.mouseMove, [pos]);
} }
} //if } //if
@ -885,7 +879,6 @@ Metamaps.JIT = {
x: pos.x, x: pos.x,
y: pos.y y: pos.y
}; };
$(document).trigger(Metamaps.JIT.events.mouseMove, [pos]);
} }
} }
else if ((e.button == 2 || (e.button == 0 && e.altKey) || e.buttons == 2) && !authorized) { else if ((e.button == 2 || (e.button == 0 && e.altKey) || e.buttons == 2) && !authorized) {

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

@ -1781,8 +1781,11 @@ Metamaps.Realtime = {
var reenableRealtime = function () { var reenableRealtime = function () {
self.reenableRealtime(); self.reenableRealtime();
}; };
var turnOff = function () {
self.turnOff();
};
$(".rtOn").click(reenableRealtime); $(".rtOn").click(reenableRealtime);
$(".rtOff").click(self.turnOff); $(".rtOff").click(turnOff);
$('.sidebarCollaborateIcon').click(self.toggleBox); $('.sidebarCollaborateIcon').click(self.toggleBox);
$('.sidebarCollaborateBox').click(function(event){ $('.sidebarCollaborateBox').click(function(event){
@ -1849,7 +1852,7 @@ Metamaps.Realtime = {
endActiveMap: function () { endActiveMap: function () {
var self = Metamaps.Realtime; var self = Metamaps.Realtime;
$(document).off(Metamaps.JIT.events.mouseMove); $(document).off('mousemove');
self.socket.removeAllListeners(); self.socket.removeAllListeners();
self.socket.emit('endMapperNotify'); self.socket.emit('endMapperNotify');
$(".collabCompass").remove(); $(".collabCompass").remove();
@ -1941,10 +1944,15 @@ Metamaps.Realtime = {
self.attachMapListener(); self.attachMapListener();
// local event listeners that trigger events // local event listeners that trigger events
var sendCoords = function (event, coords) { var sendCoords = function (event) {
var pixels = {
x: event.pageX,
y: event.pageY
};
var coords = Metamaps.Util.pixelsToCoords(pixels);
self.sendCoords(coords); self.sendCoords(coords);
}; };
$(document).on(Metamaps.JIT.events.mouseMove, sendCoords); $(document).mousemove(sendCoords);
var zoom = function (event, e) { var zoom = function (event, e) {
if (e) { if (e) {
@ -2087,7 +2095,7 @@ Metamaps.Realtime = {
}; };
// create an item for them in the realtime box // create an item for them in the realtime box
if (data.userid !== Metamaps.Active.Mapper.id) { if (data.userid !== Metamaps.Active.Mapper.id && self.status) {
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;
@ -4415,10 +4423,19 @@ Metamaps.Map.InfoBox = {
self.selectingPermission = false; self.selectingPermission = false;
var permission = $(this).attr('class'); var permission = $(this).attr('class');
var permBefore = Metamaps.Active.Map.get('permission');
Metamaps.Active.Map.save({ Metamaps.Active.Map.save({
permission: permission permission: permission
}); });
Metamaps.Active.Map.updateMapWrapper(); Metamaps.Active.Map.updateMapWrapper();
if (permBefore !== 'commons' && permission === 'commons') {
Metamaps.Realtime.setupSocket();
Metamaps.Realtime.turnOn();
}
else if (permBefore === 'commons' && permission === 'public') {
Metamaps.Realtime.turnOff(true); // true is to 'silence'
// the notification that would otherwise be sent
}
shareable = permission === 'private' ? '' : 'shareable'; shareable = permission === 'private' ? '' : 'shareable';
$('.mapPermission').removeClass('commons public private minimize').addClass(permission); $('.mapPermission').removeClass('commons public private minimize').addClass(permission);
$('.mapPermission .permissionSelect').remove(); $('.mapPermission .permissionSelect').remove();