Merge pull request #94 from aaugustin/django-2.0

Add compatibility with Django 2.0.
This commit is contained in:
Pouria Hadjibagheri 2018-01-10 20:02:40 +00:00 committed by GitHub
commit 715359b4fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -95,9 +95,9 @@ class MarkdownxWidget(forms.Textarea):
return attrs return attrs
class Media: class Media:
js = { js = [
'markdownx/js/markdownx{}.js'.format(minified), 'markdownx/js/markdownx{}.js'.format(minified),
} ]
class AdminMarkdownxWidget(MarkdownxWidget, widgets.AdminTextareaWidget): class AdminMarkdownxWidget(MarkdownxWidget, widgets.AdminTextareaWidget):
@ -107,9 +107,9 @@ class AdminMarkdownxWidget(MarkdownxWidget, widgets.AdminTextareaWidget):
""" """
class Media: class Media:
css = { css = {
'all': {'markdownx/admin/css/markdownx{}.css'.format(minified), } 'all': ['markdownx/admin/css/markdownx{}.css'.format(minified)]
} }
js = { js = [
'markdownx/js/markdownx{}.js'.format(minified), 'markdownx/js/markdownx{}.js'.format(minified),
} ]