Fix the initialization

feincms · Feb 22, 2024 · 13bf6e1 · 13bf6e1
1 parent f2ab694
commit 13bf6e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,10 @@ Change log
 Next version
 ============
 
+- Fixed the content editor initialization: The active region was only set after
+  saving and not initially.
+
+
 6.4 (2024-02-16)
 ================
 

diff --git a/content_editor/static/content_editor/content_editor.js b/content_editor/static/content_editor/content_editor.js
@@ -658,9 +658,12 @@ django.jQuery(function ($) {
   }
 
   const restoreEditorState = () => {
-    const state = SS.get(location.pathname)
+    let tabs = $(".tabs.regions .tab")
+
+    const state = location.hash.includes("restore")
+      ? SS.get(location.pathname)
+      : null
     if (state) {
-      let tabs = $(".tabs.regions .tab")
       let tab = tabs.filter(`[data-region="${state.region}"]`)
       if (tab.length) {
         tab.click()
@@ -680,16 +683,16 @@ django.jQuery(function ($) {
       setTimeout(() => {
         window.scrollTo(0, state.scrollY)
       }, 200)
+    } else {
+      tabs.eq(0).click()
     }
   }
 
   $("form").submit(function () {
     this.action += "#restore"
     saveEditorState()
   })
-  setTimeout(() => {
-    if (location.hash.includes("restore")) restoreEditorState()
-  }, 1)
+  setTimeout(restoreEditorState, 1)
 
   ContentEditor.plugins.forEach(function (plugin) {
     ContentEditor.addPluginButton(plugin.prefix, plugin.button)