Move pgadmin plugins for codemirror back out of the vendor area.

web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js

@@ -1,8 +1,8 @@
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("codemirror"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["codemirror"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {

web/pgadmin/tools/__init__.py

@@ -15,8 +15,34 @@ from pgadmin.utils.ajax import bad_request
 
 MODULE_NAME = 'tools'
 
+class ToolsModule(PgAdminModule):
+    def get_own_javascripts(self):
+        from flask import url_for
+        return [{
+            'name': 'pgadmin-sqlfoldcode',
+            'path': url_for(
+                'static',
+                filename='js/codemirror/addon/fold/pgadmin-sqlfoldcode'
+            ),
+            'when': 'debugger'
+        },{
+            'name': 'slick.pgadmin.editors',
+            'path': url_for(
+                'static',
+                filename='js/slickgrid/slick.pgadmin.editors'
+            ),
+            'when': 'debugger'
+        },{
+            'name': 'slick.pgadmin.formatters',
+            'path': url_for(
+                'static',
+                filename='js/slickgrid/slick.pgadmin.formatters'
+            ),
+            'when': 'debugger'
+        }]
+
 # Initialise the module
-blueprint = PgAdminModule(MODULE_NAME, __name__)
+blueprint = ToolsModule(MODULE_NAME, __name__)
 
 
 @blueprint.route("/")

web/pgadmin/tools/debugger/templates/debugger/js/direct.js

@@ -2,7 +2,7 @@ define(
   ['jquery', 'underscore', 'underscore.string', 'alertify', 'pgadmin','pgadmin.browser',
    'backbone', 'backgrid', 'codemirror', 'backform','pgadmin.tools.debugger.ui',
   'wcdocker', 'pgadmin.backform', 'pgadmin.backgrid', 'codemirror/addon/selection/active-line',
-  'codemirror/addon/fold/foldgutter', 'codemirror/addon/fold/foldcode', 'codemirror/addon/fold/pgadmin-sqlfoldcode'],
+  'codemirror/addon/fold/foldgutter', 'codemirror/addon/fold/foldcode', 'pgadmin-sqlfoldcode'],
   function($, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, CodeMirror, Backform, debug_function_again) {
 
   if (pgAdmin.Browser.tree != null) {

web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js

@@ -7,15 +7,15 @@ define(
     'codemirror/addon/selection/active-line', 'codemirror/addon/fold/foldcode',
     'codemirror/addon/fold/foldgutter', 'codemirror/addon/hint/show-hint',
     'codemirror/addon/hint/sql-hint', 'pgadmin.file_manager',
-    'codemirror/addon/fold/pgadmin-sqlfoldcode',
+    'pgadmin-sqlfoldcode',
     'codemirror/addon/scroll/simplescrollbars',
     'codemirror/addon/dialog/dialog',
     'codemirror/addon/search/search',
     'codemirror/addon/search/searchcursor',
     'codemirror/addon/search/jump-to-line',
     'backgrid.sizeable.columns', 'slickgrid/slick.formatters',
-    'slickgrid/slick.pgadmin.formatters', 'slickgrid/slick.editors',
+    'slick.pgadmin.formatters', 'slickgrid/slick.editors',
-    'slickgrid/slick.pgadmin.editors', 'slickgrid/plugins/slick.autotooltips',
+    'slick.pgadmin.editors', 'slickgrid/plugins/slick.autotooltips',
     'slickgrid/plugins/slick.cellrangedecorator',
     'slickgrid/plugins/slick.cellrangeselector',
     'slickgrid/plugins/slick.cellselectionmodel',