From 0b162335a8237043cf4b7895fa2fa72c7559c297 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 29 Jun 2022 15:07:49 +0300 Subject: [PATCH] Added validation once widget is empty --- .../Pages/CmsKit/Contents/addWidgetModal.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index c57dd4f2aa..8785add3b7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -11,7 +11,6 @@ $(function () { $("#PropertySideId").html(''); volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) { var widgetTypes = data.items.filter(v => v.key === widgetType); - //TODO null check var firstWidgetType = widgetTypes[0]; for (const property of firstWidgetType.properties) { let html = "
" + @@ -38,13 +37,17 @@ $(function () { .replace('MarkdownWYSIWYG', '') .replace('AW', ''); - var updatedText = "[Widget Type=\"" + widgetType + "\" "; + let updatedText = ''; + if (widgetType != undefined) { - for (var i = 0; i < keys.length; i++) { - updatedText += keys[i] + "=\"" + values[i] + "\" "; - } + updatedText = "[Widget Type=\"" + widgetType + "\" "; + + for (var i = 0; i < keys.length; i++) { + updatedText += keys[i] + "=\"" + values[i] + "\" "; + } - updatedText += "]"; + updatedText += "]"; + } if (contentEditorText == '\n\n\n') { //TODO fails event @@ -54,11 +57,9 @@ $(function () { $("#ContentEditor")[0].innerHTML = replacedInnerHtml; } else { - $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; } - $('#addWidgetModal').modal('hide'); }); };