Skip to content

Commit c9dfa1a

Browse files
committed
Version Editor.js in settings.py
1 parent 9cdd61a commit c9dfa1a

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

django_editorjs_fields/config.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@
55

66
DEBUG = getattr(settings, "DEBUG", False)
77

8+
EDITORJS_VERSION = getattr(settings, "EDITORJS_VERSION", '2.19.0')
9+
810
EDITORJS_IMAGE_UPLOAD_PATH = str(
911
getattr(settings, 'EDITORJS_IMAGE_UPLOAD_PATH', 'uploads/images/')
1012
) + datetime.now().strftime("%Y/%m/")
1113

12-
EDITORJS_IMAGE_NAME_ORIGINAL = getattr(settings, "EDITORJS_IMAGE_NAME_ORIGINAL", False)
14+
EDITORJS_IMAGE_NAME_ORIGINAL = getattr(
15+
settings, "EDITORJS_IMAGE_NAME_ORIGINAL", False)
16+
1317
EDITORJS_IMAGE_NAME_POSTFIX = getattr(
1418
settings, "EDITORJS_IMAGE_NAME_POSTFIX", token_urlsafe(5)
1519
)
16-
EDITORJS_IMAGE_NAME = getattr(settings, "EDITORJS_IMAGE_NAME", token_urlsafe(8))
20+
21+
EDITORJS_IMAGE_NAME = getattr(
22+
settings, "EDITORJS_IMAGE_NAME", token_urlsafe(8))
1723

1824
DEFAULT_PLUGINS = (
1925
'@editorjs/paragraph',

django_editorjs_fields/fields.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@ class EditorJsFieldMixin:
2525
def __init__(self, plugins=None, tools=None, **kwargs):
2626
self.plugins = plugins
2727
self.tools = tools
28-
self.version = kwargs.pop('version', '2.19.0')
2928
self.use_editor_js = kwargs.pop('use_editor_js', True)
3029
super().__init__(**kwargs)
3130

3231
def formfield(self, **kwargs):
3332
if self.use_editor_js:
34-
widget = EditorJsWidget(
35-
plugins=self.plugins, tools=self.tools, version=self.version
36-
)
33+
widget = EditorJsWidget(plugins=self.plugins, tools=self.tools)
3734
else:
3835
widget = Textarea()
3936

django_editorjs_fields/widgets.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
from django.utils.functional import cached_property
66
from django.utils.safestring import mark_safe
77

8-
from .config import DEFAULT_CONFIG_PLUGINS, DEFAULT_PLUGINS
8+
from .config import DEFAULT_CONFIG_PLUGINS, DEFAULT_PLUGINS, EDITORJS_VERSION
99

1010

1111
class EditorJsWidget(widgets.Textarea):
12-
def __init__(self, version, plugins=None, tools=None, **kwargs):
13-
self.version = version
12+
def __init__(self, plugins=None, tools=None, **kwargs):
1413
self.plugins = DEFAULT_PLUGINS if plugins is None else plugins
1514
self.tools = tools or {}
1615
super().__init__(**kwargs)
@@ -36,7 +35,7 @@ def media(self):
3635

3736
js_list = [
3837
'//cdn.jsdelivr.net/npm/@editorjs/editorjs@'
39-
+ self.version # default plugin
38+
+ EDITORJS_VERSION # default plugin
4039
]
4140

4241
if plugins:
@@ -45,7 +44,8 @@ def media(self):
4544
js_list.append('django-editorjs-fields/js/django-editorjs-fields.js')
4645

4746
return Media(
48-
css={'all': ['django-editorjs-fields/css/django-editorjs-fields.css']},
47+
css={
48+
'all': ['django-editorjs-fields/css/django-editorjs-fields.css']},
4949
js=js_list,
5050
)
5151

0 commit comments

Comments
 (0)