Merge remote-tracking branch 'upstream/pull/5315'

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 146d876f789643d20abfed4043cbf44989c8af59..b94db8b557e8fe7430be8e14fe490887fa107918 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,4 +1,10 @@
-//= require leaflet.locatecontrol/src/L.Control.Locate
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+
+(function () {
+  $(document).on("change", "#user_all", function () {
+    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
+  });
+}());

 
 $(document).ready(function () {
   var defaultHomeZoom = 12;
 
 $(document).ready(function () {
   var defaultHomeZoom = 12;


@@ -121,7 +127,7 @@ $(document).ready(function () {
         var user = $(this).data("user");
         if (user.lon && user.lat) {
           L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)
         var user = $(this).data("user");
         if (user.lon && user.lat) {
           L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)

-            .bindPopup(user.description);
+            .bindPopup(user.description, { minWidth: 200 });

         }
       });
     }
         }
       });
     }


@@ -200,10 +206,6 @@ $(document).ready(function () {
     enableAuth();
   }
 
     enableAuth();
   }
 

-  $("#user_all").change(function () {
-    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
-  });
-

   $("#content.user_confirm").each(function () {
     $(this).hide();
     $(this).find("#confirm").submit();
   $("#content.user_confirm").each(function () {
     $(this).hide();
     $(this).find("#confirm").submit();