Fix: more generic check for empty wysiwyg

pimcore · Oct 20, 2023 · 273121b · 273121b
1 parent fd882e6
commit 273121b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/public/js/pimcore/document/edit.js b/public/js/pimcore/document/edit.js
@@ -326,8 +326,7 @@ pimcore.document.edit = Class.create({
                     const name = editable.getName();
                     const type = editable.getType();
                     const value = editable.getValue();
-                    if (type === "wysiwyg" &&
-                        (value === "<p><br></p>" || value === "<p><br data-mce-bogus=\"1\"></p>")) {
+                    if (type === "wysiwyg" && value.replace(/(<([^>]+)>)/gm, "") === "") {
                         values[name] = {
                             data: '',
                             type: type

diff --git a/public/js/pimcore/object/edit.js b/public/js/pimcore/object/edit.js
@@ -91,11 +91,7 @@ pimcore.object.edit = Class.create({
                 //only include changed values in save response.
                 if(currentField.isDirty()) {
                     if (currentField.fieldConfig.fieldtype === "wysiwyg" &&
-                        (
-                            currentField.data === "<p><br></p>" ||
-                            currentField.data === "<p><br data-mce-bogus=\"1\"></p>"
-                        )
-                    )
+                        currentField.data.replace(/(<([^>]+)>)/gm, "") === "")
                         {
                         currentField.data = "";
                     }

diff --git a/public/js/pimcore/settings/translationEditor.js b/public/js/pimcore/settings/translationEditor.js
@@ -79,7 +79,7 @@ pimcore.settings.translation.editor = Class.create({
                 if (editorType == "wysiwyg") {
                    newValue = this.value;
                    // Check and reset what the TinyMCE returns when empty
-                   if (newValue == '<p><br data-mce-bogus="1"></p>'){
+                   if (newValue.replace(/(<([^>]+)>)/gm, "") === ""){
                        newValue = '';
                    }
                 } else {