Skip to content

Commit 0555c9b

Browse files
committed
wrap loaded js files with pre and post
1 parent f18b98f commit 0555c9b

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

cms/forms/widgets.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ class PageSelectWidget(MultiWidget):
2323

2424
class Media:
2525
js = (
26+
'cms/js/modules/jquery.noconflict.pre.js',
2627
'cms/js/dist/bundle.admin.base.min.js',
2728
'cms/js/widgets/forms.pageselectwidget.js',
29+
'cms/js/modules/jquery.noconflict.post.js'
2830
)
2931

3032
def __init__(self, site_choices=None, page_choices=None, attrs=None):
@@ -192,8 +194,10 @@ class AppHookSelect(Select):
192194

193195
class Media:
194196
js = (
197+
'cms/js/modules/jquery.noconflict.pre.js',
195198
'cms/js/dist/bundle.admin.base.min.js',
196199
'cms/js/widgets/forms.apphookselect.js',
200+
'cms/js/modules/jquery.noconflict.post.js'
197201
)
198202

199203
def __init__(self, attrs=None, choices=(), app_namespaces={}):
@@ -246,8 +250,10 @@ class ApplicationConfigSelect(Select):
246250

247251
class Media:
248252
js = (
253+
'cms/js/modules/jquery.noconflict.pre.js'
249254
'cms/js/dist/bundle.admin.base.min.js',
250255
'cms/js/widgets/forms.apphookselect.js',
256+
'cms/js/modules/jquery.noconflict.post.js'
251257
)
252258

253259
def __init__(self, attrs=None, choices=(), app_configs={}):

cms/forms/wizards.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ class PageTypeSelect(forms.widgets.Select):
6969
"""
7070
class Media:
7171
js = (
72+
'cms/js/modules/jquery.noconflict.pre.js',
7273
'cms/js/dist/bundle.admin.base.min.js',
7374
'cms/js/modules/cms.base.js',
7475
'cms/js/widgets/wizard.pagetypeselect.js',
76+
'cms/js/modules/jquery.noconflict.post.js'
7577
)
7678

7779

cms/wizards/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class Media:
5151
js = (
5252
'cms/js/modules/jquery.noconflict.pre.js',
5353
'cms/js/dist/bundle.admin.base.min.js',
54-
'cms/js/modules/jquery.noconflict.post.js',
5554
'cms/js/modules/cms.wizards.js',
55+
'cms/js/modules/jquery.noconflict.post.js'
5656
)
5757

5858
page = forms.ModelChoiceField(

0 commit comments

Comments
 (0)