Skip to content

Commit 4eac6ad

Browse files
committed
0.2.6 Release
SimpleMDE is now loaded from settings. DAJE_SIMPLE_MDE_CSS and DAJE_SIMPLE_MDE_JS are arrays of files that should be loaded. We default to the original simple MDE. In the example project, we override those with the custom Designlab SimpleMDE files and the DesignLab Showdown Extensions
1 parent 800fccb commit 4eac6ad

File tree

8 files changed

+51
-6
lines changed

8 files changed

+51
-6
lines changed

django_admin_json_editor/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from .admin import JSONEditorWidget # noqa
22

3-
__version__ = '0.2.5'
3+
__version__ = '0.2.6'

django_admin_json_editor/admin.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import collections
44
from django import forms
5+
from .conf import conf
56
from django.utils.safestring import mark_safe
67
from django.template.loader import render_to_string
78

@@ -62,19 +63,19 @@ def render(self, name, value, attrs=None, renderer=None):
6263

6364
@property
6465
def media(self):
66+
67+
6568
css = {
6669
'all': [
6770
'django_admin_json_editor/bootstrap/css/bootstrap.min.css',
6871
'django_admin_json_editor/fontawesome/css/font-awesome.min.css',
6972
'django_admin_json_editor/style.css',
70-
'django_admin_json_editor/simplemde/simplemde.min.css'
7173
]
7274
}
7375
js = [
7476
'django_admin_json_editor/jquery/jquery.min.js',
7577
'django_admin_json_editor/bootstrap/js/bootstrap.min.js',
7678
'django_admin_json_editor/jsoneditor/jsoneditor.min.js',
77-
'django_admin_json_editor/simplemde/simplemde.min.js'
7879
]
7980
if self._sceditor:
8081
css['all'].append('django_admin_json_editor/sceditor/themes/default.min.css')
@@ -83,4 +84,8 @@ def media(self):
8384
if self._default_options.get('template') == 'handlebars':
8485
js.append('django_admin_json_editor/handlebars/handlebars-v4.0.11.js')
8586

87+
# Load our default Simple MDE files, but these can be overridden in django settings.
88+
css['all'] += conf.DAJE_SIMPLE_MDE_CSS
89+
js += conf.DAJE_SIMPLE_MDE_JS
90+
8691
return forms.Media(css=css, js=js)

django_admin_json_editor/conf.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from django.conf import settings
2+
3+
4+
class Settings(object):
5+
"""
6+
Shadow Django's settings with a little logic
7+
"""
8+
9+
@property
10+
def DAJE_SIMPLE_MDE_CSS(self):
11+
return getattr(settings, 'DAJE_SIMPLE_MDE_CSS', ['django_admin_json_editor/simplemde/simplemde.min.css'])
12+
13+
@property
14+
def DAJE_SIMPLE_MDE_JS(self):
15+
return getattr(settings, 'DAJE_SIMPLE_MDE_JS', ['django_admin_json_editor/simplemde/simplemde.min.js'])
16+
17+
18+
conf = Settings()

django_admin_json_editor/static/django_admin_json_editor/jsoneditor/jsoneditor.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/app/static/app/designlab-showdown-extensions.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)