Skip to content

Commit 2b41265

Browse files
committed
Fix javascript media file ordering for Django 2.0
1 parent b217eb0 commit 2b41265

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

fluent_contents/admin/placeholdereditor.py

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ class Media:
6464
# to display the placeholder panes in a tabbar format.
6565
# The remaining scripts should just operate the same without it.
6666
js = (
67+
'admin/js/vendor/jquery/jquery{}.js'.format('' if settings.DEBUG else '.min'),
68+
'admin/js/jquery.init.js',
6769
'fluent_contents/admin/vendor/Sortable.js',
6870
'fluent_contents/admin/jquery.cookie.js',
6971
'fluent_contents/admin/cp_admin.js',

fluent_contents/forms/widgets.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from django.conf import settings
12
from django.contrib.admin.widgets import AdminTextareaWidget
23
from django.forms.utils import flatatt
34
from django.forms.widgets import Widget
@@ -19,6 +20,8 @@ class PlaceholderFieldWidget(Widget):
1920

2021
class Media:
2122
js = (
23+
'admin/js/vendor/jquery/jquery{}.js'.format('' if settings.DEBUG else '.min'),
24+
'admin/js/jquery.init.js',
2225
'fluent_contents/admin/cp_admin.js',
2326
'fluent_contents/admin/cp_data.js',
2427
'fluent_contents/admin/cp_plugins.js',

0 commit comments

Comments
 (0)