Merge branch 'CulturePlex-feature/forms-loadevent'

Author: leplatrem

leaflet/__init__.py

@@ -29,6 +29,7 @@
     'TILES': DEFAULT_TILES,
     'OVERLAYS': [],
     'ATTRIBUTION_PREFIX': None,
+    'LOADEVENT': 'load',
     'SPATIAL_EXTENT': None,
     'DEFAULT_ZOOM': None,
     'MIN_ZOOM': None,

leaflet/forms/widgets.py

@@ -8,7 +8,7 @@
 except ImportError:
     from .backport import BaseGeometryWidget
 
-from leaflet import PLUGINS, PLUGIN_FORMS
+from leaflet import app_settings, PLUGINS, PLUGIN_FORMS
 
 
 class LeafletWidget(BaseGeometryWidget):
@@ -40,6 +40,9 @@ def render(self, name, value, attrs=None):
         # Retrieve params from Field init (if any)
         self.geom_type = self.attrs.get('geom_type', self.geom_type)
 
+        # Setting 'loadevent' added in the widget constructor
+        loadevent = self.attrs.get('loadevent', app_settings.get('LOADEVENT'))
+
         attrs = attrs or {}
 
         # In BaseGeometryWidget, geom_type is set using gdal, and fails with generic.
@@ -52,6 +55,7 @@ def render(self, name, value, attrs=None):
                      module='geodjango_%s' % map_id,
                      id_map=map_id + '_map',
                      id_map_callback=map_id + '_map_callback',
+                     loadevent=loadevent,
                      modifiable=self.modifiable,
                      target_map=attrs.get('target_map', getattr(self, 'target_map', None)),
                      geometry_field_class=attrs.get('geometry_field_class', getattr(self, 'geometry_field_class', 'L.GeometryField')),

leaflet/templates/leaflet/widget.html

@@ -37,7 +37,7 @@
 
 {% if not target_map %}
 {% block map %}
-    {% leaflet_map id_map callback=id_map_callback settings_overrides=settings_overrides %}
+    {% leaflet_map id_map callback=id_map_callback loadevent=loadevent settings_overrides=settings_overrides %}
 {% endblock map %}
 {% endif %}
 

leaflet/templatetags/leaflet_tags.py

@@ -58,13 +58,17 @@ def leaflet_js(plugins=None):
 
 
 @register.inclusion_tag('leaflet/_leaflet_map.html')
-def leaflet_map(name, callback=None, fitextent=True, creatediv=True, loadevent='load', settings_overrides={}):
+def leaflet_map(name, callback=None, fitextent=True, creatediv=True,
+                loadevent=app_settings.get('LOADEVENT'),
+                settings_overrides={}):
     """
 
     :param name:
     :param callback:
     :param fitextent:
     :param creatediv:
+    :param loadevent:
+    :param settings_overrides:
     :return:
     """
     extent = None