@@ -13,7 +13,12 @@ def __init__(self, schema, collapsed=True, sceditor=False, editor_options=None):
13
13
self ._schema = schema
14
14
self ._collapsed = collapsed
15
15
self ._sceditor = sceditor
16
- self ._editor_options = editor_options or {}
16
+
17
+ self ._editor_options = {
18
+ 'theme' : 'bootstrap3' ,
19
+ 'iconlib' : 'fontawesome4' ,
20
+ }
21
+ self ._editor_options .update (editor_options or {})
17
22
18
23
def render (self , name , value , attrs = None , renderer = None ):
19
24
if callable (self ._schema ):
@@ -24,12 +29,8 @@ def render(self, name, value, attrs=None, renderer=None):
24
29
schema ['title' ] = ' '
25
30
schema ['options' ] = {'collapsed' : int (self ._collapsed )}
26
31
27
- editor_options = {
28
- 'theme' : 'bootstrap3' ,
29
- 'iconlib' : 'fontawesome4' ,
30
- 'schema' : schema ,
31
- }
32
- editor_options .update (self ._editor_options )
32
+ editor_options = self ._editor_options .copy ()
33
+ editor_options ['schema' ] = schema
33
34
34
35
context = {
35
36
'name' : name ,
@@ -43,16 +44,19 @@ def render(self, name, value, attrs=None, renderer=None):
43
44
def media (self ):
44
45
css = {
45
46
'all' : [
46
- 'django_admin_json_editor/bootstrap/css/bootstrap.min.css' ,
47
47
'django_admin_json_editor/fontawesome/css/font-awesome.min.css' ,
48
48
'django_admin_json_editor/style.css' ,
49
49
]
50
50
}
51
51
js = [
52
- 'django_admin_json_editor/jquery/jquery.min.js' ,
53
- 'django_admin_json_editor/bootstrap/js/bootstrap.min.js' ,
54
52
'django_admin_json_editor/jsoneditor/jsoneditor.min.js' ,
55
53
]
54
+
55
+ if self ._editor_options ['theme' ] == 'bootstrap3' :
56
+ css ['all' ].append ('django_admin_json_editor/bootstrap/css/bootstrap.min.css' )
57
+ js .append ('django_admin_json_editor/jquery/jquery.min.js' )
58
+ js .append ('django_admin_json_editor/bootstrap/js/bootstrap.min.js' )
59
+
56
60
if self ._sceditor :
57
61
css ['all' ].append ('django_admin_json_editor/sceditor/themes/default.min.css' )
58
62
js .append ('django_admin_json_editor/sceditor/jquery.sceditor.bbcode.min.js' )
0 commit comments