Merge 323f74d into 4aafcd6

makinacorpus · Nov 19, 2018 · 9bfe0a5 · 9bfe0a5
2 parents 4aafcd6 + 323f74d
commit 9bfe0a5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/mapentity/static/mapentity/leaflet-objectslayer.js b/mapentity/static/mapentity/leaflet-objectslayer.js
@@ -205,7 +205,7 @@ L.ObjectsLayer = L.GeoJSON.extend({
             this.fire('highlight', {layer: layer});
         }
         else {
-            layer.setStyle(layer._defaultStyle);
+            this.resetStyle(layer);
         }
     },
 

diff --git a/mapentity/static/mapentity/mapentity.map.js b/mapentity/static/mapentity/mapentity.map.js
@@ -232,8 +232,12 @@ $(window).on('entity:map:list', function (e, data) {
         return window.SETTINGS.urls.detail.replace(new RegExp('modelname', 'g'), data.modelname)
                                           .replace('0', properties.pk);
     }
-
-    var style = L.Util.extend({}, window.SETTINGS.map.styles.others);
+    if (typeof window.SETTINGS.map.styles.others === "function"){
+        var style = window.SETTINGS.map.styles.others;
+    }
+    else{
+        var style = L.Util.extend({}, window.SETTINGS.map.styles.others);
+    }
     var objectsLayer = new L.ObjectsLayer(null, {
         objectUrl: getUrl,
         style: style,

diff --git a/mapentity/templates/mapentity/base.html b/mapentity/templates/mapentity/base.html
@@ -90,7 +90,7 @@
 
     {# Global Javascript settings #}
     <script src="{% url JS_SETTINGS_VIEW %}?callback=window.SETTINGS%3D"></script>
-
+    {% block change_style %}{% endblock change_style %}
     {% compress js %}
 
         {% if DEBUG %}