Merge remote-tracking branch 'origin/1.7' into 1.x

pimcore · Dec 4, 2024 · 1d45642 · 1d45642
2 parents 89c8713 + 252e17c
commit 1d45642
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/public/js/pimcore/document/editables/wysiwyg.js b/public/js/pimcore/document/editables/wysiwyg.js
@@ -96,7 +96,7 @@ pimcore.document.editables.wysiwyg = Class.create(pimcore.document.editable, {
         }
 
         document.addEventListener(pimcore.events.changeWysiwyg, function (e) {
-            if(`${this.id}_textarea` === e.detail.e.target.id) {
+            if(this.textarea.id === e.detail.e.target.id) {
                 this.setValue(e.detail.data);
             }
         }.bind(this));
@@ -122,6 +122,7 @@ pimcore.document.editables.wysiwyg = Class.create(pimcore.document.editable, {
                 e: e,
                 data: data,
                 context: "document",
+                textareaId: this.textarea.id
             }
         });
 

diff --git a/public/js/pimcore/object/tags/wysiwyg.js b/public/js/pimcore/object/tags/wysiwyg.js
@@ -205,6 +205,7 @@ pimcore.object.tags.wysiwyg = Class.create(pimcore.object.tags.abstract, {
                 e: e,
                 data: data,
                 context: "object",
+                textareaId: this.editableDivId
             },
         });
 

diff --git a/public/js/pimcore/settings/translationEditor.js b/public/js/pimcore/settings/translationEditor.js
@@ -200,6 +200,7 @@ pimcore.settings.translation.editor = Class.create({
                 e: e,
                 data: data,
                 context: "translation",
+                textareaId: this.editableDivId
             },
         });
-Original file line number
+Diff line change
@@ Expand Up @@
                     e: e,
                     data: data,
                     context: "object",
+                    textareaId: this.editableDivId
                 },
             });
@@ Expand Down @@