Support for bootstrap 4

abogushov · May 27, 2020 · 9d09d34 · 9d09d34
1 parent 4ce91c1
commit 9d09d34
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 309 deletions.
diff --git a/django_admin_json_editor/admin.py b/django_admin_json_editor/admin.py
@@ -15,7 +15,7 @@ def __init__(self, schema, collapsed=True, sceditor=False, editor_options=None):
         self._sceditor = sceditor
 
         self._editor_options = {
-            'theme': 'bootstrap3',
+            'theme': 'bootstrap4',
             'iconlib': 'fontawesome4',
         }
         self._editor_options.update(editor_options or {})
@@ -35,7 +35,6 @@ def render(self, name, value, attrs=None, renderer=None):
         context = {
             'name': name,
             'data': value,
-            'sceditor': int(self._sceditor),
             'editor_options': json.dumps(editor_options),
         }
         return mark_safe(render_to_string(self.template_name, context))
@@ -52,10 +51,10 @@ def media(self):
             'django_admin_json_editor/jsoneditor/jsoneditor.min.js',
         ]
 
-        if self._editor_options['theme'] == 'bootstrap3':
+        if self._editor_options['theme'] == 'bootstrap4':
             css['all'].append('django_admin_json_editor/bootstrap/css/bootstrap.min.css')
-            js.append('django_admin_json_editor/jquery/jquery.min.js')
-            js.append('django_admin_json_editor/bootstrap/js/bootstrap.min.js')
+            js.append('django_admin_json_editor/jquery/jquery-3.5.1.slim.min.js')
+            js.append('django_admin_json_editor/bootstrap/js/bootstrap.bundle.min.js')
 
         if self._sceditor:
             css['all'].append('django_admin_json_editor/sceditor/themes/default.min.css')

diff --git a/django_admin_json_editor/static/django_admin_json_editor/bootstrap/css/bootstrap.min.css b/django_admin_json_editor/static/django_admin_json_editor/bootstrap/css/bootstrap.min.css
diff --git a/...n_editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.eot b/...n_editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/...tatic/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.svg b/...tatic/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/...n_editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.ttf b/...n_editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/..._editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.woff b/..._editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/...editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/...editor/static/django_admin_json_editor/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/...go_admin_json_editor/static/django_admin_json_editor/bootstrap/js/bootstrap.bundle.min.js b/...go_admin_json_editor/static/django_admin_json_editor/bootstrap/js/bootstrap.bundle.min.js
diff --git a/django_admin_json_editor/static/django_admin_json_editor/bootstrap/js/bootstrap.min.js b/django_admin_json_editor/static/django_admin_json_editor/bootstrap/js/bootstrap.min.js
diff --git a/django_admin_json_editor/static/django_admin_json_editor/jquery/jquery-3.5.1.slim.min.js b/django_admin_json_editor/static/django_admin_json_editor/jquery/jquery-3.5.1.slim.min.js
diff --git a/django_admin_json_editor/static/django_admin_json_editor/jquery/jquery.min.js b/django_admin_json_editor/static/django_admin_json_editor/jquery/jquery.min.js
diff --git a/django_admin_json_editor/templates/django_admin_json_editor/editor.html b/django_admin_json_editor/templates/django_admin_json_editor/editor.html
@@ -4,7 +4,6 @@
     var container = document.getElementById("{{ name }}_editor");
     var options = {{ editor_options|safe }};
     var {{ name }}_editor = new JSONEditor(container, options);
-    JSONEditor.plugins.sceditor.emoticonsEnabled = {{ sceditor }};
     {{ name }}_editor.on('change', function () {
         var errors = {{ name }}_editor.validate();
         if (errors.length) {