Skip to content

Remove forms dependency on 'extras' #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Remove forms dependency on 'extras' #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion leaflet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
# Add plugins required for forms (not auto-included)
# 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']
if SRID:
_forms_js += ['leaflet/proj4.js',
Expand Down
6 changes: 5 additions & 1 deletion leaflet/forms/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ def media(self):

# We assume that including media for widget means there is
# no Leaflet at all in the page.
js = ['leaflet/leaflet.js'] + PLUGINS[PLUGIN_FORMS]['js']
js = [
'leaflet/leaflet.js',
'leaflet/leaflet.extras.js',
Copy link
Contributor Author

@adamchainz adamchainz Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-adding the "extras" file here, because it's no longer coming from the form plugin dependencies.

*PLUGINS[PLUGIN_FORMS]['js'],
]
css = ['leaflet/leaflet.css'] + PLUGINS[PLUGIN_FORMS]['css']
return forms.Media(js=js, css={'screen': css})

Expand Down