Fixed django admin jQuery conflict issues

.gitignore

@@ -76,3 +76,4 @@ example_2/env/
 assets/
 tests/testapp/settings_local.py
 node_modules/
+/env3/

fabfile.py

@@ -5,6 +5,7 @@
 JS_FILE_MAPPING = {
     "GooglePointFieldWidget": {
         "input_files": [
+            "mapwidgets/static/mapwidgets/js/jquery_init.js",
             "mapwidgets/static/mapwidgets/js/jquery_class.js",
             "mapwidgets/static/mapwidgets/js/django_mw_base.js",
             "mapwidgets/static/mapwidgets/js/mw_google_point_field.js",
@@ -14,12 +15,20 @@
     },
     "GooglePointFieldInlineWidget": {
         "input_files": [
+            "mapwidgets/static/mapwidgets/js/jquery_init.js",
             "mapwidgets/static/mapwidgets/js/jquery_class.js",
             "mapwidgets/static/mapwidgets/js/django_mw_base.js",
             "mapwidgets/static/mapwidgets/js/mw_google_point_field.js",
             "mapwidgets/static/mapwidgets/js/mw_google_point_field_generater.js",
         ],
         "output_file": "mapwidgets/static/mapwidgets/js/mw_google_point_inline_field.min.js"
+    },
+    "GoogleStaticOverlayMapWidget": {
+        "input_files": [
+            "mapwidgets/static/mapwidgets/js/jquery_init.js",
+            "mapwidgets/static/mapwidgets/js/jquery.custom.magnific-popup.js",
+        ],
+        "output_file": "mapwidgets/static/mapwidgets/js/jquery.custom.magnific-popup.min.js"
     }
 }
 
@@ -104,7 +113,7 @@ def docker_run_unit_tests():
 
 
 def docker_postgres_shell():
-    local('docker exec -it {} /bin/bash -c "su postgres"'.format(POSTGRES_CONTAINER_NAME))
+    local('docker exec -it {} /bin/bash'.format(POSTGRES_CONTAINER_NAME))
 
 
 def docker_covarage_tests():

mapwidgets/static/mapwidgets/js/django_mw_base.js

@@ -207,4 +207,4 @@
 		}
 	});
 
-})(jQuery || django.jQuery);
+})(mapWidgets.jQuery);

mapwidgets/static/mapwidgets/js/jquery.custom.magnific-popup.js

@@ -1881,4 +1881,4 @@
           }
         });
     });
-})(jQuery || django.jQuery);
+})(mapWidgets.jQuery);

mapwidgets/static/mapwidgets/js/jquery_class.js

@@ -1,3 +1,11 @@
+var mapWidgets = mapWidgets || {};
+if (typeof django !== "undefined" && django.jQuery){
+    mapWidgets.jQuery = django.jQuery.noConflict();
+}else{
+    mapWidgets.jQuery = jQuery.noConflict();
+}
+
+
 (function($) {
 
     var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\bSuper\b/ : /.*/;
@@ -69,4 +77,4 @@
         };
     }
 
-})(jQuery || django.jQuery);
+})(mapWidgets.jQuery);

mapwidgets/static/mapwidgets/js/jquery_init.js

@@ -0,0 +1,8 @@
+var mapWidgets = mapWidgets || {};
+
+// Use Django Admin jQuery function if exists, otherwise initialise `mapWidgets.jQuery` from global jQuery.
+if (typeof django !== "undefined" && django.jQuery){
+    mapWidgets.jQuery = django.jQuery.noConflict();
+}else{
+    mapWidgets.jQuery = jQuery.noConflict();
+}

mapwidgets/static/mapwidgets/js/mw_google_point_field.js

@@ -106,4 +106,4 @@
         }
     });
 
-})(jQuery || django.jQuery);
+})(mapWidgets.jQuery);

mapwidgets/static/mapwidgets/js/mw_google_point_field_generater.js

@@ -52,5 +52,5 @@
             new DjangoGooglePointFieldWidget(mapWidgetOptions);
         }
     });
-})(jQuery || django.jQuery);
+})(mapWidgets.jQuery);
 

mapwidgets/templates/mapwidgets/google-point-field-inline-widget.html

@@ -48,6 +48,6 @@
                     "fieldValue": fieldValue
                 });
             {% endif %}
-        })(jQuery || django.jQuery);
+        })(mapWidgets.jQuery);
     </script>
 {% endblock javascript %}

mapwidgets/templates/mapwidgets/google-point-field-widget.html

@@ -87,6 +87,6 @@
             {% block extra_javascript %}
 
             {% endblock %}
-        })(jQuery || django.jQuery);
+        })(mapWidgets.jQuery);
     </script>
 {% endblock javascript %}

mapwidgets/widgets.py

@@ -69,14 +69,14 @@ def media(self):
         }
 
         js = [
-            "https://code.jquery.com/jquery-3.3.1.slim.min.js",
             "https://maps.googleapis.com/maps/api/js?libraries=places&language={}&key={}".format(
                 mw_settings.LANGUAGE, mw_settings.GOOGLE_MAP_API_KEY
             )
         ]
 
         if not mw_settings.MINIFED:  # pragma: no cover
             js = js + [
+                "mapwidgets/js/jquery_init.js",
                 "mapwidgets/js/jquery_class.js",
                 "mapwidgets/js/django_mw_base.js",
                 "mapwidgets/js/mw_google_point_field.js",
@@ -168,14 +168,14 @@ def media(self):
         }
 
         js = [
-            "https://code.jquery.com/jquery-3.3.1.slim.min.js",
             "https://maps.googleapis.com/maps/api/js?libraries=places&language={}&key={}".format(
                 mw_settings.LANGUAGE, mw_settings.GOOGLE_MAP_API_KEY
             )
         ]
 
         if not mw_settings.MINIFED:  # pragma: no cover
             js = js + [
+                "mapwidgets/js/jquery_init.js",
                 "mapwidgets/js/jquery_class.js",
                 "mapwidgets/js/django_mw_base.js",
                 "mapwidgets/js/mw_google_point_field.js",
@@ -289,11 +289,15 @@ class Media:
                 minify_if_not_debug("mapwidgets/css/magnific-popup{}.css"),
             )
         }
-
-        js = (
-            "https://code.jquery.com/jquery-3.3.1.slim.min.js",
-            minify_if_not_debug("mapwidgets/js/jquery.custom.magnific-popup{}.js"),
-        )
+        if not mw_settings.MINIFED:  # pragma: no cover
+            js = (
+                "mapwidgets/js/jquery_init.js",
+                "mapwidgets/js/jquery.custom.magnific-popup.js",
+            )
+        else:
+            js = (
+                "mapwidgets/js/jquery.custom.magnific-popup.min.js",
+            )
 
     def __init__(self, zoom=None, size=None, thumbnail_size=None, *args, **kwargs):
         self.thumbnail_size = thumbnail_size