namespace the event listeners to turn them off (#637)

This commit is contained in:
Connor Turland 2016-09-11 18:47:59 -04:00 committed by GitHub
parent 4a8b017144
commit 6b2887e8da

View file

@ -200,7 +200,7 @@ Metamaps.Realtime = {
endActiveMap: function () { endActiveMap: function () {
var self = Metamaps.Realtime var self = Metamaps.Realtime
$(document).off('mousemove') $(document).off('.map')
self.socket.removeAllListeners() self.socket.removeAllListeners()
if (self.inConversation) self.leaveCall() if (self.inConversation) self.leaveCall()
self.socket.emit('endMapperNotify') self.socket.emit('endMapperNotify')
@ -552,7 +552,7 @@ Metamaps.Realtime = {
var coords = Metamaps.Util.pixelsToCoords(pixels) var coords = Metamaps.Util.pixelsToCoords(pixels)
self.sendCoords(coords) self.sendCoords(coords)
} }
$(document).mousemove(sendCoords) $(document).on('mousemove.map', sendCoords)
var zoom = function (event, e) { var zoom = function (event, e) {
if (e) { if (e) {
@ -565,49 +565,49 @@ Metamaps.Realtime = {
} }
self.positionPeerIcons() self.positionPeerIcons()
} }
$(document).on(Metamaps.JIT.events.zoom, zoom) $(document).on(Metamaps.JIT.events.zoom + '.map', zoom)
$(document).on(Metamaps.JIT.events.pan, self.positionPeerIcons) $(document).on(Metamaps.JIT.events.pan + '.map', self.positionPeerIcons)
var sendTopicDrag = function (event, positions) { var sendTopicDrag = function (event, positions) {
self.sendTopicDrag(positions) self.sendTopicDrag(positions)
} }
$(document).on(Metamaps.JIT.events.topicDrag, sendTopicDrag) $(document).on(Metamaps.JIT.events.topicDrag + '.map', sendTopicDrag)
var sendNewTopic = function (event, data) { var sendNewTopic = function (event, data) {
self.sendNewTopic(data) self.sendNewTopic(data)
} }
$(document).on(Metamaps.JIT.events.newTopic, sendNewTopic) $(document).on(Metamaps.JIT.events.newTopic + '.map', sendNewTopic)
var sendDeleteTopic = function (event, data) { var sendDeleteTopic = function (event, data) {
self.sendDeleteTopic(data) self.sendDeleteTopic(data)
} }
$(document).on(Metamaps.JIT.events.deleteTopic, sendDeleteTopic) $(document).on(Metamaps.JIT.events.deleteTopic + '.map', sendDeleteTopic)
var sendRemoveTopic = function (event, data) { var sendRemoveTopic = function (event, data) {
self.sendRemoveTopic(data) self.sendRemoveTopic(data)
} }
$(document).on(Metamaps.JIT.events.removeTopic, sendRemoveTopic) $(document).on(Metamaps.JIT.events.removeTopic + '.map', sendRemoveTopic)
var sendNewSynapse = function (event, data) { var sendNewSynapse = function (event, data) {
self.sendNewSynapse(data) self.sendNewSynapse(data)
} }
$(document).on(Metamaps.JIT.events.newSynapse, sendNewSynapse) $(document).on(Metamaps.JIT.events.newSynapse + '.map', sendNewSynapse)
var sendDeleteSynapse = function (event, data) { var sendDeleteSynapse = function (event, data) {
self.sendDeleteSynapse(data) self.sendDeleteSynapse(data)
} }
$(document).on(Metamaps.JIT.events.deleteSynapse, sendDeleteSynapse) $(document).on(Metamaps.JIT.events.deleteSynapse + '.map', sendDeleteSynapse)
var sendRemoveSynapse = function (event, data) { var sendRemoveSynapse = function (event, data) {
self.sendRemoveSynapse(data) self.sendRemoveSynapse(data)
} }
$(document).on(Metamaps.JIT.events.removeSynapse, sendRemoveSynapse) $(document).on(Metamaps.JIT.events.removeSynapse + '.map', sendRemoveSynapse)
var sendNewMessage = function (event, data) { var sendNewMessage = function (event, data) {
self.sendNewMessage(data) self.sendNewMessage(data)
} }
$(document).on(Metamaps.Views.room.events.newMessage, sendNewMessage) $(document).on(Metamaps.Views.room.events.newMessage + '.map', sendNewMessage)
}, },
attachMapListener: function () { attachMapListener: function () {
var self = Metamaps.Realtime var self = Metamaps.Realtime