From 2c3b387e4231452fb54eb584d7d13d9295933556 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Wed, 28 Sep 2016 13:00:32 -0400
Subject: [PATCH 1/6] Update index.js

---
 frontend/src/Metamaps/Map/index.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/Metamaps/Map/index.js b/frontend/src/Metamaps/Map/index.js
index 24ea08ea..ce277331 100644
--- a/frontend/src/Metamaps/Map/index.js
+++ b/frontend/src/Metamaps/Map/index.js
@@ -38,11 +38,6 @@ const Map = {
   init: function () {
     var self = Map
 
-    // prevent right clicks on the main canvas, so as to not get in the way of our right clicks
-    $('#wrapper').on('contextmenu', function (e) {
-      return false
-    })
-
     $('.starMap').click(function () {
       if ($(this).is('.starred')) self.unstar()
       else self.star()

From 10a2782f8553e1fad14f9686b1e7e0d3e3b5bba7 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Wed, 28 Sep 2016 13:03:44 -0400
Subject: [PATCH 2/6] Update JIT.js

---
 frontend/src/Metamaps/JIT.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js
index 4a665bdc..54ec74b1 100644
--- a/frontend/src/Metamaps/JIT.js
+++ b/frontend/src/Metamaps/JIT.js
@@ -1305,6 +1305,9 @@ const JIT = {
     // create new menu for clicked on node
     var rightclickmenu = document.createElement('div')
     rightclickmenu.className = 'rightclickmenu'
+    //prevent the custom context menu from immediately opening the default context menu as well
+    rightclickmenu.setAttribute('oncontextmenu','return false')
+    
     // add the proper options to the menu
     var menustring = '<ul>'
 
@@ -1550,6 +1553,8 @@ const JIT = {
     // create new menu for clicked on node
     var rightclickmenu = document.createElement('div')
     rightclickmenu.className = 'rightclickmenu'
+    //prevent the custom context menu from immediately opening the default context menu as well
+    rightclickmenu.setAttribute('oncontextmenu','return false')
 
     // add the proper options to the menu
     var menustring = '<ul>'

From 67c4912c62bb08b3d317a7b87efc34fa47e49988 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Wed, 28 Sep 2016 13:37:08 -0400
Subject: [PATCH 3/6] Update index.js

---
 frontend/src/Metamaps/Map/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/Metamaps/Map/index.js b/frontend/src/Metamaps/Map/index.js
index ce277331..24ea08ea 100644
--- a/frontend/src/Metamaps/Map/index.js
+++ b/frontend/src/Metamaps/Map/index.js
@@ -38,6 +38,11 @@ const Map = {
   init: function () {
     var self = Map
 
+    // prevent right clicks on the main canvas, so as to not get in the way of our right clicks
+    $('#wrapper').on('contextmenu', function (e) {
+      return false
+    })
+
     $('.starMap').click(function () {
       if ($(this).is('.starred')) self.unstar()
       else self.star()

From 4e506ad290a8e13823f81c29a7fbcd19f4996f05 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Wed, 28 Sep 2016 15:18:44 -0400
Subject: [PATCH 4/6] Update JIT.js

---
 frontend/src/Metamaps/JIT.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js
index 54ec74b1..519bffd4 100644
--- a/frontend/src/Metamaps/JIT.js
+++ b/frontend/src/Metamaps/JIT.js
@@ -888,6 +888,7 @@ const JIT = {
           var myY = e.clientY - 30
           $('#new_topic').css('left', myX + 'px')
           $('#new_topic').css('top', myY + 'px')
+          $('#new_topic').attr('oncontextmenu','return false') //prevents the mouse up event from opening the default context menu on this element
           Create.newTopic.x = eventInfo.getPos().x
           Create.newTopic.y = eventInfo.getPos().y
           Visualize.mGraph.plot()

From a37f60060c2bdac219a025234ffbdefcf1b6a2b5 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Wed, 28 Sep 2016 15:31:08 -0400
Subject: [PATCH 5/6] Update JIT.js

---
 frontend/src/Metamaps/JIT.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js
index 519bffd4..54ec74b1 100644
--- a/frontend/src/Metamaps/JIT.js
+++ b/frontend/src/Metamaps/JIT.js
@@ -888,7 +888,6 @@ const JIT = {
           var myY = e.clientY - 30
           $('#new_topic').css('left', myX + 'px')
           $('#new_topic').css('top', myY + 'px')
-          $('#new_topic').attr('oncontextmenu','return false') //prevents the mouse up event from opening the default context menu on this element
           Create.newTopic.x = eventInfo.getPos().x
           Create.newTopic.y = eventInfo.getPos().y
           Visualize.mGraph.plot()

From e8746ee7d9523f17cbcb4064a932cc81b5de14b2 Mon Sep 17 00:00:00 2001
From: Robert Best <chessscholar@gmail.com>
Date: Wed, 28 Sep 2016 15:32:49 -0400
Subject: [PATCH 6/6] Update Create.js

---
 frontend/src/Metamaps/Create.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/Metamaps/Create.js b/frontend/src/Metamaps/Create.js
index 5d290fcd..db71fb8c 100644
--- a/frontend/src/Metamaps/Create.js
+++ b/frontend/src/Metamaps/Create.js
@@ -209,6 +209,7 @@ const Create = {
         bringToFront: true
       })
       $('.new_topic').hide()
+      $('#new_topic').attr('oncontextmenu','return false') //prevents the mouse up event from opening the default context menu on this element
     },
     name: null,
     newId: 1,