Merge branch 'main' into fix-ckeditor-upgrade-docs

Author: fsbraun

djangocms_text/cms_plugins.py

@@ -579,7 +579,7 @@ def get_messages(self, request):
 
     @classmethod
     @lru_cache
-    def get_child_plugin_candidates(cls, slot, page):
+    def get_child_plugin_candidates(cls, slot: str, page=None, template=None):
         """
 
         This method is a class method that returns a list of child plugin candidates for a given slot and page.
@@ -608,7 +608,7 @@ def get_child_plugin_candidates(cls, slot, page):
         return text_enabled_plugins
 
     @staticmethod
-    def render_plugin_icon(plugin):
+    def render_plugin_icon(plugin: CMSPluginBase):
         icon = getattr(plugin, "text_icon", None)
         if icon is None:
             return

djangocms_text/contrib/text_ckeditor4/__init__.py

@@ -1,10 +1,13 @@
 from djangocms_text.editors import RTEConfig
 
+from cms.utils.urlutils import static_with_version
+
 
 ckeditor4 = RTEConfig(
     name="ckeditor4",
     config="CKEDITOR",
     js=(
+        static_with_version("cms/js/dist/bundle.admin.base.min.js"),
         "djangocms_text/vendor/ckeditor4/ckeditor.js",
         "djangocms_text/bundles/bundle.ckeditor4.min.js",
     ),

djangocms_text/widgets.py

@@ -18,14 +18,6 @@
 from .editors import DEFAULT_TOOLBAR_CMS, DEFAULT_TOOLBAR_HTMLField, get_editor_base_config, get_editor_config
 from .utils import admin_reverse, cms_placeholder_add_plugin
 
-try:
-    from cms.utils.urlutils import static_with_version
-except ModuleNotFoundError:  # pragma: no cover
-
-    def static_with_version(path):
-        return path
-
-
 rte_config = get_editor_config()
 #: The configuration for the text editor widget
 
@@ -106,7 +98,6 @@ def media(self):
                 ),
             },
             js=(
-                static_with_version("cms/js/dist/bundle.admin.base.min.js"),
                 "djangocms_text/bundles/bundle.editor.min.js",
                 *rte_config.js,
             ),

private/js/cms.editor.js

@@ -42,7 +42,7 @@ class CMSEditor {
                 this.CMS.$(window).on('cms-content-refresh', () => {
                     if (document.querySelector('template.cms-plugin')) {
                         // django CMS core does not wrap newly inserted inline editable fields
-                        // this.CMS.API.Helpers.reloadBrowser();
+                        this.CMS.API.Helpers.reloadBrowser();
                     } else {
                         this._resetInlineEditors();
                     }
@@ -230,7 +230,7 @@ class CMSEditor {
             } else {  // no, wrap now!
                 wrapper = document.createElement('div');
                 wrapper.classList.add('cms-editor-inline-wrapper', 'wrapped');
-                wrapper.classList.add('cms-plugin', cls);
+                wrapper.classList.add('cms-plugin', cls, 'cms-plugin-start', 'cms-plugin-end');
                 wrapper = this._wrapAll(elements, wrapper);
             }
             wrapper.dataset.cmsEditUrl = url;
@@ -499,7 +499,7 @@ class CMSEditor {
                         }
                     }
                     // Additional content for the page disrupts inline editing and needs to be removed
-                    delete this.CMS.API.Helpers.dataBridge.content;
+                    delete this.CMS.API.Helpers.dataBridge.structure.content;
 
                     if (this.CMS.settings.version.startsWith('3.')) {
                         /* Reflect dirty flag in django CMS < 4 */