Prepend forms assets (instead of extend) if PLUGINS['forms'] already …

…exists
makinacorpus · Sep 27, 2013 · 6eb451d · 6eb451d
1 parent bfcbc08
commit 6eb451d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -10,6 +10,7 @@ CHANGELOG
 * Fix syntax error if form widget translations contains quotes.
 * Fix dependency error if Leaflet is loaded after the form widget in the DOM.
 * Respect plugins declaration order using OrderedDicts
+* Prepend forms assets (instead of extend) if PLUGINS['forms'] already exists.
 
 0.8.0 (2013-09-18)
 ------------------

diff --git a/leaflet/__init__.py b/leaflet/__init__.py
@@ -89,16 +89,17 @@
 
 PLUGIN_ALL = 'ALL'
 PLUGINS_DEFAULT = '__default__'
+PLUGIN_FORMS = 'forms'
 
 # Add plugins required for forms (not auto-included)
-PLUGIN_FORMS = 'forms'
+# Assets will be preprended to any existing entry in PLUGINS['forms']
 _forms_js = ['leaflet/draw/leaflet.draw.js',
              'leaflet/leaflet.extras.js',
              'leaflet/leaflet.forms.js']
 _forms_css = ['leaflet/draw/leaflet.draw.css']
 _forms_plugins = PLUGINS.setdefault(PLUGIN_FORMS, {})
-_forms_plugins.setdefault('js', []).extend(_forms_js)
-_forms_plugins.setdefault('css', []).extend(_forms_css)
+_forms_plugins['js'] = _forms_js + _forms_plugins.get('js', [])
+_forms_plugins['css'] = _forms_css + _forms_plugins.get('css', [])
 _forms_plugins.setdefault('auto-include', False)
 PLUGINS[PLUGIN_FORMS] = _forms_plugins