From 43e62832ddfaf4bdf6fe56414f1d02ae0c9f6437 Mon Sep 17 00:00:00 2001
From: Stuart Kenny <skenny@tchpc.tcd.ie>
Date: Mon, 22 Jan 2018 10:17:59 +0000
Subject: [PATCH] Move context menu function from main script

---
 .../database/module/MOD-INF/controller.js     |  2 --
 .../module/scripts/database-extension.js      | 26 -------------------
 .../scripts/index/database-source-ui.js       | 26 +++++++++++++++++++
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/extensions/database/module/MOD-INF/controller.js b/extensions/database/module/MOD-INF/controller.js
index d192649bd..5df821fbf 100644
--- a/extensions/database/module/MOD-INF/controller.js
+++ b/extensions/database/module/MOD-INF/controller.js
@@ -120,8 +120,6 @@ function init() {
     "project/scripts",
     module,
     [
-      "scripts/index/jquery.contextMenu.min.js",
-      "scripts/index/jquery.ui.position.min.js",
       "scripts/database-extension.js",
       "scripts/project/database-exporters.js"
     ]
diff --git a/extensions/database/module/scripts/database-extension.js b/extensions/database/module/scripts/database-extension.js
index 56ce061fe..4c4347935 100644
--- a/extensions/database/module/scripts/database-extension.js
+++ b/extensions/database/module/scripts/database-extension.js
@@ -27,32 +27,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-$(function(){
-    $.contextMenu({
-        selector: '.context-menu-one', 
-        trigger: 'left',
-        build: function($trigger, e) {
-   
-            return {
-                callback: function(key, options) {
-                    var m = "clicked: " + key;
-                    DatabaseExtension.handleSavedConnectionClicked(key,  $(this).text());
-                    
-                },
-
-                items: {
-                    "edit": 	   {name: " Edit "},
-                    "sep0": "",
-                    "delete":   {name: " Delete "},
-                    "sep1": "---------",
-                    "connect": {name: " Connect "},
-                    "dummy":  {name: "", icon: ""}
-                }
-            };
-        }
-    });
-});
-
 var DatabaseExtension = {};
 
 DatabaseExtension.currentConnection = {};
diff --git a/extensions/database/module/scripts/index/database-source-ui.js b/extensions/database/module/scripts/index/database-source-ui.js
index fdc86516e..f93ad77ad 100644
--- a/extensions/database/module/scripts/index/database-source-ui.js
+++ b/extensions/database/module/scripts/index/database-source-ui.js
@@ -27,6 +27,32 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+$(function(){
+    $.contextMenu({
+        selector: '.context-menu-one',
+        trigger: 'left',
+        build: function($trigger, e) {
+
+            return {
+                callback: function(key, options) {
+                    var m = "clicked: " + key;
+                    DatabaseExtension.handleSavedConnectionClicked(key,  $(this).text());
+
+                },
+
+                items: {
+                    "edit":        {name: " Edit "},
+                    "sep0": "",
+                    "delete":   {name: " Delete "},
+                    "sep1": "---------",
+                    "connect": {name: " Connect "},
+                    "dummy":  {name: "", icon: ""}
+                }
+            };
+        }
+    });
+});
+
 Refine.DatabaseSourceUI = function(controller) {
   this._controller = controller;
 };