diff --git a/frontend/src/Metamaps/Cable.js b/frontend/src/Metamaps/Cable.js index 8cb64717..15d01554 100644 --- a/frontend/src/Metamaps/Cable.js +++ b/frontend/src/Metamaps/Cable.js @@ -42,14 +42,14 @@ const Cable = { if (t1.authorizeToShow(m) && t2.authorizeToShow(m) && s.authorizeToShow(m) && !DataModel.Synapses.get(event.synapse.id)) { // refactor the heck outta this, its adding wicked wait time var topic1, topic2, node1, node2, synapse, mapping, cancel, mapper - + function waitThenRenderSynapse() { if (synapse && mapping && mapper) { topic1 = synapse.getTopic1() node1 = topic1.get('node') topic2 = synapse.getTopic2() node2 = topic2.get('node') - + Synapse.renderSynapse(mapping, synapse, node1, node2, false) } else if (!cancel) { setTimeout(waitThenRenderSynapse, 10) @@ -108,7 +108,7 @@ const Cable = { if (edge.getData('mappings').length - 1 === 0) { Control.hideEdge(edge) } - + var index = indexOf(edge.getData('synapses'), synapse) edge.getData('mappings').splice(index, 1) edge.getData('synapses').splice(index, 1) @@ -129,7 +129,7 @@ const Cable = { if (t.authorizeToShow(m) && !DataModel.Topics.get(event.topic.id)) { // refactor the heck outta this, its adding wicked wait time var topic, mapping, mapper, cancel - + function waitThenRenderTopic() { if (topic && mapping && mapper) { Topic.renderTopic(mapping, topic, false, false) @@ -137,7 +137,7 @@ const Cable = { setTimeout(waitThenRenderTopic, 10) } } - + mapper = DataModel.Mappers.get(event.topic.user_id) if (mapper === undefined) { Mapper.get(event.topic.user_id, function(m) { diff --git a/frontend/src/Metamaps/Create.js b/frontend/src/Metamaps/Create.js index 177e951f..466900e5 100644 --- a/frontend/src/Metamaps/Create.js +++ b/frontend/src/Metamaps/Create.js @@ -291,18 +291,18 @@ const Create = { }, source: synapseBloodhound }, - { - name: 'existing_synapses', - limit: 50, - display: function(s) { return s.label }, - templates: { - suggestion: function(s) { - return Hogan.compile($('#synapseAutocompleteTemplate').html()).render(s) - }, - header: '

Existing synapses

' + { + name: 'existing_synapses', + limit: 50, + display: function(s) { return s.label }, + templates: { + suggestion: function(s) { + return Hogan.compile($('#synapseAutocompleteTemplate').html()).render(s) }, - source: existingSynapseBloodhound - }] + header: '

Existing synapses

' + }, + source: existingSynapseBloodhound + }] ) $('#synapse_desc').keyup(function(e) { diff --git a/frontend/src/Metamaps/Realtime/events.js b/frontend/src/Metamaps/Realtime/events.js index 45626f72..b23fb3f3 100644 --- a/frontend/src/Metamaps/Realtime/events.js +++ b/frontend/src/Metamaps/Realtime/events.js @@ -14,7 +14,7 @@ module.exports = { SEND_COORDS: 'SEND_COORDS', DRAG_TOPIC: 'DRAG_TOPIC', - /* EVENTS RECEIVABLE FROM NODE SERVER*/ + /* EVENTS RECEIVABLE FROM NODE SERVER */ JUNTO_UPDATED: 'JUNTO_UPDATED', INVITED_TO_CALL: 'INVITED_TO_CALL', INVITED_TO_JOIN: 'INVITED_TO_JOIN', @@ -29,5 +29,5 @@ module.exports = { NEW_MAPPER: 'NEW_MAPPER', LOST_MAPPER: 'LOST_MAPPER', TOPIC_DRAGGED: 'TOPIC_DRAGGED', - PEER_COORDS_UPDATED: 'PEER_COORDS_UPDATED', + PEER_COORDS_UPDATED: 'PEER_COORDS_UPDATED' } diff --git a/frontend/src/Metamaps/Realtime/index.js b/frontend/src/Metamaps/Realtime/index.js index b613239b..a52532c5 100644 --- a/frontend/src/Metamaps/Realtime/index.js +++ b/frontend/src/Metamaps/Realtime/index.js @@ -152,7 +152,7 @@ let Realtime = { config: { DOUBLE_CLICK_TOLERANCE: 200 } }) self.room.videoAdded(self.handleVideoAdded) - + self.startActiveMap() } // if Active.Mapper }, diff --git a/frontend/src/Metamaps/Realtime/receivable.js b/frontend/src/Metamaps/Realtime/receivable.js index d37f1b6f..cabc21d5 100644 --- a/frontend/src/Metamaps/Realtime/receivable.js +++ b/frontend/src/Metamaps/Realtime/receivable.js @@ -210,7 +210,7 @@ export const callInProgress = self => () => { GlobalUI.notifyUser(notifyText, true) $('#toast button.yes').click(e => self.joinCall()) $('#toast button.no').click(e => GlobalUI.clearNotify()) - ChatView.conversationInProgress() + ChatView.conversationInProgress() } export const callStarted = self => () => { diff --git a/frontend/src/Metamaps/Views/ChatView.js b/frontend/src/Metamaps/Views/ChatView.js index f46a2caf..0024a623 100644 --- a/frontend/src/Metamaps/Views/ChatView.js +++ b/frontend/src/Metamaps/Views/ChatView.js @@ -49,7 +49,7 @@ const ChatView = { $('#' + ChatView.domId).hide() }, render: () => { - if (!Active.Map) return + if (!Active.Map) return const self = ChatView self.mapChat = ReactDOM.render(React.createElement(MapChat, { conversationLive: self.conversationLive, @@ -111,7 +111,7 @@ const ChatView = { conversationInProgress: participating => { ChatView.conversationLive = true ChatView.isParticipating = participating - ChatView.render() + ChatView.render() }, conversationEnded: () => { ChatView.conversationLive = false @@ -144,7 +144,7 @@ const ChatView = { }, addMessage: (message, isInitial, wasMe) => { const self = ChatView - if (!isInitial) self.mapChat.newMessage() + if (!isInitial) self.mapChat.newMessage() if (!wasMe && !isInitial && self.alertSound) self.sound.play('receivechat') self.messages.add(message) self.render() diff --git a/frontend/src/Metamaps/Views/index.js b/frontend/src/Metamaps/Views/index.js index ab96e552..c496b3b0 100644 --- a/frontend/src/Metamaps/Views/index.js +++ b/frontend/src/Metamaps/Views/index.js @@ -9,7 +9,7 @@ import { JUNTO_UPDATED } from '../Realtime/events' const Views = { init: (serverData) => { $(document).on(JUNTO_UPDATED, () => ExploreMaps.render()) - ChatView.init([serverData['sounds/MM_sounds.mp3'],serverData['sounds/MM_sounds.ogg']]) + ChatView.init([serverData['sounds/MM_sounds.mp3'], serverData['sounds/MM_sounds.ogg']]) }, ExploreMaps, ChatView, diff --git a/frontend/src/components/Maps/Header.js b/frontend/src/components/Maps/Header.js index f360e7a5..9de1eb9b 100644 --- a/frontend/src/components/Maps/Header.js +++ b/frontend/src/components/Maps/Header.js @@ -41,7 +41,7 @@ class Header extends Component { linkClass={activeClass('active')} data-router="true" text="All Maps" - /> + />