feature: use Django media to load in widget dependencies

CentreForDigitalHumanities · Oct 20, 2023 · 1040fc4 · 1040fc4
1 parent e03f246
commit 1040fc4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/src/cdh/core/forms.py b/src/cdh/core/forms.py
@@ -357,6 +357,12 @@ def to_python(self, value):
 class TinyMCEWidget(forms.Widget):
     """A TinyMCE widget for HTML editting"""
     template_name = "cdh.core/forms/widgets/tinymce.html"
+    class Media:
+        js = [
+            'cdh.core/js/tinymce/tinymce.min.js',
+            'cdh.core/js/tinymce/tinymce-jquery.min.js',
+            'cdh.core/js/tinymce/shim.js'
+        ]
 
     def __init__(
             self,
@@ -387,10 +393,6 @@ def __init__(
         self.plugins = plugins
         self.toolbar = toolbar
 
-        add_js_file('cdh.core/js/tinymce/tinymce.min.js')
-        add_js_file('cdh.core/js/tinymce/tinymce-jquery.min.js')
-        add_js_file('cdh.core/js/tinymce/shim.js')
-
     def get_context(self, *args, **kwargs):
         context = super().get_context(*args, **kwargs)
 

diff --git a/src/cdh/core/mail/widgets.py b/src/cdh/core/mail/widgets.py
@@ -11,6 +11,8 @@ class EmailContentEditWidget(TinyMCEWidget):
 
     Will add a 'preview email' button to the editor.
     """
+    class Media:
+        js = ['cdh.core/js/tinymce-preview-mail-plugin.js']
 
     def __init__(
             self,
@@ -40,8 +42,6 @@ def __init__(
         self.toolbar += " | preview-mail"
         self.plugins.append('preview-mail')
 
-        add_js_file('cdh.core/js/tinymce-preview-mail-plugin.js')
-
     def get_context(self, *args, **kwargs):
         context = super().get_context(*args, **kwargs)
 

diff --git a/src/cdh/files/apps.py b/src/cdh/files/apps.py
@@ -1,7 +1,5 @@
 from django.apps import AppConfig
 
-from cdh.core.file_loading import add_css_file, add_js_file
-
 
 class FilesConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
@@ -10,6 +8,3 @@ class FilesConfig(AppConfig):
     def ready(self):
         import cdh.files.checks  # noQA, the import has side effects, linter!
         import cdh.files.signals # noQA, same story
-
-        add_js_file('cdh.files/widgets.js')
-        add_css_file('cdh.files/widgets.css')
diff --git a/src/cdh/files/forms/widgets.py b/src/cdh/files/forms/widgets.py
@@ -3,6 +3,12 @@
 
 
 class SimpleFileInput(FileInput):
+    class Media:
+        js = ['cdh.files/widgets.js']
+        css = {
+            'screen': ['cdh.files/widgets.css']
+        }
+
     clear_checkbox_label = _('Clear')
     initial_text = _('Currently')
     input_text = _('Change')
@@ -59,6 +65,12 @@ def value_omitted_from_data(self, data, files, name):
 
 
 class TrackedFileInput(SimpleFileInput):
+    class Media:
+        js = ['cdh.files/widgets.js']
+        css = {
+            'screen': ['cdh.files/widgets.css']
+        }
+
     template_name = 'cdh.files/widgets/tracked_file.html'
 
     # Strings used in the template

diff --git a/src/cdh/integration_platform/digital_identity_api/forms/widgets.py b/src/cdh/integration_platform/digital_identity_api/forms/widgets.py
@@ -4,17 +4,13 @@
 
 
 class SingleUserWidget(widgets.Input):
+    class Media:
+        js = [
+            'cdh.integration_platform/digital_identity_api/single_user_widget.js'
+        ]
     input_type = 'hidden'
     template_name = "cdh.integration_platform/digital_identity_api/single_user_widget.html"
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        add_js_file(
-            'cdh.integration_platform/digital_identity_api/single_user_widget'
-            '.js'
-        )
-
     @property
     def is_hidden(self):
         return False