From bbe36fc7fb2d1dc4d50b76265d5ac735da78552e Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Mon, 12 Nov 2018 09:57:48 +0100
Subject: [PATCH] some refactorings on relation map

---
 .../services/note_detail_relation_map.js      | 60 +++++++------------
 src/public/stylesheets/relation-map.css       |  9 +--
 2 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/src/public/javascripts/services/note_detail_relation_map.js b/src/public/javascripts/services/note_detail_relation_map.js
index 0fef299a5..793d250e0 100644
--- a/src/public/javascripts/services/note_detail_relation_map.js
+++ b/src/public/javascripts/services/note_detail_relation_map.js
@@ -136,9 +136,11 @@ function initPanZoom() {
         smoothScroll: false,
         onMouseDown: function(event) {
             if (clipboard) {
-                const {x, y} = getMousePos(event);
+                let {x, y} = getMousePosition(event);
 
-                console.log(x, y);
+                // modifying position so that cursor is on the top-center of the box
+                x -= 80;
+                y -= 15;
 
                 createNoteBox(clipboard.id, clipboard.title, x, y);
 
@@ -151,10 +153,10 @@ function initPanZoom() {
         }
     });
 
-    pzInstance.on('transform', () => {
+    pzInstance.on('transform', () => { // gets triggered on any transform change
         jsPlumbInstance.setZoom(getZoom());
 
-        updateTransform();
+        saveCurrentTransform();
     });
 
     if (mapData.transform) {
@@ -163,20 +165,20 @@ function initPanZoom() {
         pzInstance.moveTo(mapData.transform.x, mapData.transform.y);
     }
 
-    function updateTransform() {
-        const newTransform = pzInstance.getTransform();
-
-        if (JSON.stringify(newTransform) !== JSON.stringify(mapData.transform)) {
-            mapData.transform = newTransform;
-
-            saveData();
-        }
-    }
-
     $zoomInButton.click(() => pzInstance.zoomTo(0, 0, 1.2));
     $zoomOutButton.click(() => pzInstance.zoomTo(0, 0, 0.8));
 }
 
+function saveCurrentTransform() {
+    const newTransform = pzInstance.getTransform();
+
+    if (JSON.stringify(newTransform) !== JSON.stringify(mapData.transform)) {
+        mapData.transform = newTransform;
+
+        saveData();
+    }
+}
+
 function cleanup() {
     if (jsPlumbInstance) {
         // delete all endpoints and connections
@@ -342,9 +344,9 @@ async function createNoteBox(id, title, x, y) {
     jsPlumbInstance.getContainer().appendChild($noteBox[0]);
 
     jsPlumbInstance.draggable($noteBox[0], {
-        start:function(params) {},
-        drag:function(params) {},
-        stop:function(params) {
+        start: params => {},
+        drag: params => {},
+        stop: params => {
             const note = mapData.notes.find(note => note.id === params.el.id);
 
             if (!note) {
@@ -418,7 +420,7 @@ $addChildNotesButton.click(async () => {
 let clipboard = null;
 
 $createChildNote.click(async () => {
-    const title = "new note" || prompt("Enter title of new note", "new note");
+    const title = prompt("Enter title of new note", "new note");
 
     if (!title.trim()) {
         return;
@@ -460,7 +462,7 @@ function drop_handler(ev) {
     console.log("DROP!", ev);
 }
 
-function getMousePos(evt) {
+function getMousePosition(evt) {
     const rect = $relationMapContainer[0].getBoundingClientRect();
 
     const zoom = getZoom();
@@ -471,26 +473,6 @@ function getMousePos(evt) {
     };
 }
 
-$relationMapContainer.click(function(event) {
-    console.log("HEY!");
-
-    console.log(event.clientX, event.clientY);
-
-    if (clipboard) {
-        const {x, y} = getMousePos(event);
-
-        console.log(x, y);
-
-        createNoteBox(clipboard.id, clipboard.title, x, y);
-
-        //mapData.notes.push({ id: clipboard.id, x, y });
-
-        clipboard = null;
-    }
-
-    return true;
-});
-
 $component.on("drop", drop_handler);
 $component.on("dragover", dragover_handler);
 
diff --git a/src/public/stylesheets/relation-map.css b/src/public/stylesheets/relation-map.css
index 074ccd5eb..3d8b8c3eb 100644
--- a/src/public/stylesheets/relation-map.css
+++ b/src/public/stylesheets/relation-map.css
@@ -1,16 +1,13 @@
 #note-detail-relation-map {
     height: 100%;
-}
-
-/* this is removing dotted border around focused/active relation map */
-#note-detail-relation-map, #note-detail-relation-map:active, #note-detail-relation-map:focus {
-    outline: none;
+    overflow: hidden !important;
 }
 
 #relation-map-wrapper {
     position: relative;
     overflow: hidden !important;
-    height: 800px;
+    height: 4000px; /* we need to set fixed height. This number is probably enough to cover any screen */
+    outline: none; /* remove dotted outline on click */
 }
 
 .note-box {