From 6e347dc33a58351394d8f04ac63c23320372649a Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Sun, 5 Feb 2017 03:26:18 +0000
Subject: [PATCH] fixup synapse creation

---
 frontend/src/Metamaps/Create.js  | 13 ++++++++++---
 frontend/src/Metamaps/JIT.js     | 29 +++++++++++++++++------------
 frontend/src/Metamaps/Synapse.js |  6 +-----
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/frontend/src/Metamaps/Create.js b/frontend/src/Metamaps/Create.js
index 29877cf0..4e210c41 100644
--- a/frontend/src/Metamaps/Create.js
+++ b/frontend/src/Metamaps/Create.js
@@ -4,6 +4,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 
 import DataModel from './DataModel'
+import Engine from './Engine'
 import MetacodeSelect from '../components/MetacodeSelect'
 import Mouse from './Mouse'
 import Selected from './Selected'
@@ -360,7 +361,9 @@ console.log(codesToSwitchToIds)
 
       $('#synapse_desc').focusout(function() {
         if (Create.newSynapse.beingCreated) {
-          Synapse.createSynapseLocally()
+          Synapse.createSynapseLocally(Create.newSynapse.topic1id, Create.newSynapse.topic2id)
+          Engine.runLayout()
+          Create.newSynapse.hide()
         }
       })
 
@@ -368,7 +371,9 @@ console.log(codesToSwitchToIds)
         const TAB = 9
         if (Create.newSynapse.beingCreated && e.keyCode === TAB) {
           e.preventDefault()
-          Synapse.createSynapseLocally()
+          Synapse.createSynapseLocally(Create.newSynapse.topic1id, Create.newSynapse.topic2id)
+          Engine.runLayout()
+          Create.newSynapse.hide()
         }
       })
 
@@ -377,7 +382,9 @@ console.log(codesToSwitchToIds)
           Synapse.getSynapseFromAutocomplete(datum.id)
         } else {
           Create.newSynapse.description = datum.value
-          Synapse.createSynapseLocally()
+          Synapse.createSynapseLocally(Create.newSynapse.topic1id, Create.newSynapse.topic2id)
+          Engine.runLayout()
+          Create.newSynapse.hide()
         }
       })
     },
diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js
index a302f3d6..d75cb3f9 100644
--- a/frontend/src/Metamaps/JIT.js
+++ b/frontend/src/Metamaps/JIT.js
@@ -687,10 +687,6 @@ const JIT = {
   onMouseMoveHandler: function(_node, eventInfo, e) {
     const self = JIT
 
-    if (Mouse.synapseStartCoordinates.length) {
-      Visualize.mGraph.plot()
-    }
-
     if (Visualize.mGraph.busy) return
 
     const node = eventInfo.getNode()
@@ -731,7 +727,9 @@ const JIT = {
     } else if (e.target.id === 'topic_name' && !Create.newTopic.metacodeSelectorOpen) {
       Topic.createTopicLocally()
     } else if (Create.newSynapse.beingCreated) {
-      Synapse.createSynapseLocally()
+      Synapse.createSynapseLocally(Create.newSynapse.topic1id, Create.newSynapse.topic2id)
+      Engine.runLayout()
+      Create.newSynapse.hide()
     }
   }, // enterKeyHandler
   escKeyHandler: function() {
@@ -744,7 +742,6 @@ const JIT = {
     var authorized = Active.Map && Active.Map.authorizeToEdit(Active.Mapper)
 
     if (node && !node.nodeFrom) {
-      self.handleSelectionBeforeDragging(node, e)
 
       const pos = eventInfo.getPos()
       if ((e.button === 0 || e.buttons === 0) && authorized) {
@@ -755,13 +752,20 @@ const JIT = {
           Create.newSynapse.hide()
           // set the draw synapse start positions
           Mouse.synapseStartCoordinates = []
-          for (let i = Selected.Nodes.length - 1; i >= 0; i -= 1) {
-            const n = Selected.Nodes[i]
-            Mouse.synapseStartCoordinates.push({
-              x: n.pos.getc().x,
-              y: n.pos.getc().y
+          if (Selected.Nodes.length) {
+            Selected.Nodes.forEach(n => {
+              Mouse.synapseStartCoordinates.push({
+                x: n.pos.getc().x,
+                y: n.pos.getc().y
+              })
             })
           }
+          else {
+            Mouse.synapseStartCoordinates = [{
+              x: node.pos.getc().x,
+              y: node.pos.getc().y
+            }]
+          }
           Mouse.synapseEndCoordinates = {
             x: pos.x,
             y: pos.y
@@ -792,6 +796,7 @@ const JIT = {
         }
       }
     }
+    Visualize.mGraph.plot()
   }, // onDragMoveTopicHandler
   onDragCancelHandler: function(node, eventInfo, e) {
     JIT.tempNode = null
@@ -818,7 +823,6 @@ const JIT = {
       Create.newSynapse.node1 = JIT.tempNode
       Create.newSynapse.node2 = JIT.tempNode2
       JIT.tempNode2.setData('dim', 25, 'current')
-      Visualize.mGraph.plot()
       midpoint.x = JIT.tempNode.pos.getc().x + (JIT.tempNode2.pos.getc().x - JIT.tempNode.pos.getc().x) / 2
       midpoint.y = JIT.tempNode.pos.getc().y + (JIT.tempNode2.pos.getc().y - JIT.tempNode.pos.getc().y) / 2
       pixelPos = Util.coordsToPixels(Visualize.mGraph, midpoint)
@@ -829,6 +833,7 @@ const JIT = {
       JIT.tempNode2 = null
       JIT.tempInit = false
     }
+    Visualize.mGraph.plot()
   }, // onDragEndTopicHandler
   canvasClickHandler: function(canvasLoc, e) {
     // grab the location and timestamp of the click
diff --git a/frontend/src/Metamaps/Synapse.js b/frontend/src/Metamaps/Synapse.js
index 6ce443d8..81735815 100644
--- a/frontend/src/Metamaps/Synapse.js
+++ b/frontend/src/Metamaps/Synapse.js
@@ -43,7 +43,7 @@ const Synapse = {
       mapping.save()
     }
   },
-  createSynapseLocally: function(topic1id, topic2id, manual) {
+  createSynapseLocally: function(topic1id, topic2id) {
     var self = Synapse
     $(document).trigger(Map.events.editedByActiveMapper)
     // for each node in this array we will create a synapse going to the position2 node.
@@ -71,10 +71,6 @@ const Synapse = {
       // this function also includes the creation of the synapse in the database
       self.renderSynapse(mapping, synapse, node1, node2)
     }) // for each in synapsesToCreate
-    if (manual) {
-      Engine.runLayout()
-      Create.newSynapse.hide()
-    }
   },
   getSynapseFromAutocomplete: function(id) {
     var self = Synapse