From d1c2e82abcc2fe994eeed48e64ced338f3b315ca Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 10 Apr 2024 23:08:10 +0300 Subject: [PATCH] wysiwyg fetch empty as null --- client/src/views/fields/wysiwyg.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js index e0f6fac0c6..0827961be8 100644 --- a/client/src/views/fields/wysiwyg.js +++ b/client/src/views/fields/wysiwyg.js @@ -47,7 +47,7 @@ class WysiwygFieldView extends TextFieldView { fallbackBodySideMargin = 5 fallbackBodyTopMargin = 4 seeMoreDisabled = true - fetchEmptyValueAsNull = false + fetchEmptyValueAsNull = true validationElementSelector = '.note-editor' htmlPurificationDisabled = false htmlPurificationForEditDisabled = false @@ -719,7 +719,7 @@ class WysiwygFieldView extends TextFieldView { $div.find('style').remove(); $div.find('link[ref="stylesheet"]').remove(); - value = $div.text(); + value = $div.text(); return value; } @@ -761,20 +761,19 @@ class WysiwygFieldView extends TextFieldView { } else { data[this.name] = this.$element.val(); + } - if (this.fetchEmptyValueAsNull) { - if (!data[this.name]) { - data[this.name] = null; - } - } + if (this.fetchEmptyValueAsNull && !data[this.name]) { + data[this.name] = null; } if (this.model.has('isHtml') && this.hasBodyPlainField) { - if (this.model.get('isHtml')) { - data[this.name + 'Plain'] = this.htmlToPlain(data[this.name]); - } - else { - data[this.name + 'Plain'] = data[this.name]; + if (data[this.name] === null) { + data[this.name + 'Plain'] = null; + } else { + data[this.name + 'Plain'] = this.model.get('isHtml') ? + this.htmlToPlain(data[this.name]) : + data[this.name]; } }