From a35b9c8491e2ac568b52c3d18aa1e7eb8867e657 Mon Sep 17 00:00:00 2001 From: malik masis Date: Fri, 8 Jul 2022 15:28:59 +0300 Subject: [PATCH 01/11] Used insertText instead of set innerHtml --- .../Pages/CmsKit/Contents/addWidgetModal.js | 17 ++--------------- .../Pages/CmsKit/Pages/create.js | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 18 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 02539d377a..3a1bdeb7f7 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 @@ -30,11 +30,6 @@ $(function () { } }); - var contentEditorText = $("#ContentEditor")[0].innerText - .replace('WritePreview', '') - .replace('MarkdownWYSIWYG', '') - .replace('W', ''); - let updatedText = ''; if (widgetType != undefined) { @@ -48,16 +43,8 @@ $(function () { updatedText += "]"; } - if (contentEditorText == '\n\n\n') { - //TODO fails event - var fixedData = "
" + updatedText + "
"; - var innerHtml = $("#ContentEditor")[0].innerHTML; - var replacedInnerHtml = innerHtml.replace('

', fixedData); - $("#ContentEditor")[0].innerHTML = replacedInnerHtml; - } - else { - $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText; - } + $('#GeneratedWidgetText').val(updatedText); + $("#GeneratedWidgetText").trigger("click"); $('#addWidgetModal').modal('hide'); }); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 8dc2ab9eb4..2ea6cea91a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -6,6 +6,8 @@ $(function () { var $slug = $('#ViewModel_Slug'); var $buttonSubmit = $('#button-page-create'); + initAllEditors(); + var widgetModal = new abp.ModalManager({ viewUrl: abp.appPath + "CmsKit/Contents/AddWidgetModal", modalClass: "addWidgetModal" }); var scriptEditor = CodeMirror.fromTextArea(document.getElementById("ViewModel_Script"), { @@ -89,21 +91,20 @@ $(function () { var fileUploadUri = "/api/cms-kit-admin/media/page"; var fileUriPrefix = "/api/cms-kit/media/"; - initAllEditors(); function initAllEditors() { $('.content-editor').each(function (i, item) { initEditor(item); }); } - + var editor; function initEditor(element) { var $editorContainer = $(element); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); - var editor = new toastui.Editor({ + editor = new toastui.Editor({ el: $editorContainer[0], usageStatistics: false, useCommandShortcut: true, @@ -139,6 +140,10 @@ $(function () { }); } + //$('.ProseMirror').on('click', function (e) { + + //}); + function uploadFile(blob, callback, source) { var UPPY_OPTIONS = { endpoint: fileUploadUri, @@ -171,6 +176,11 @@ $(function () { }); } + $('#GeneratedWidgetText').click(function (e) { + var txt = $('#GeneratedWidgetText').val(); + editor.insertText(txt); + }); + function createAddWidgetButton() { //TODO add auth const button = document.createElement('button'); From c2c1643c4a990bbf99e8876b9f21799f47a3ebe8 Mon Sep 17 00:00:00 2001 From: malik masis Date: Fri, 8 Jul 2022 15:29:17 +0300 Subject: [PATCH 02/11] Fixed on Page\Create --- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml index 9348b07507..da3226420f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml @@ -76,3 +76,4 @@ + \ No newline at end of file From 83b98701f6e3783657453391de1799aa4c1dad84 Mon Sep 17 00:00:00 2001 From: malik masis Date: Sat, 9 Jul 2022 23:07:52 +0300 Subject: [PATCH 03/11] Fixed the Blogpost's editor --- .../Pages/CmsKit/BlogPosts/Create.cshtml | 1 + .../Pages/CmsKit/BlogPosts/Update.cshtml | 1 + .../Pages/CmsKit/BlogPosts/create.js | 10 ++++++++-- .../Pages/CmsKit/BlogPosts/update.js | 8 +++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml index 159bd66b5f..27a5be8083 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml @@ -98,3 +98,4 @@ } + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml index 04a41ffe5a..fc7987cc5b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml @@ -95,3 +95,4 @@ + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index 9fd95b0e14..85c4ea9a07 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -257,14 +257,15 @@ $(function () { initEditor(item); }); } - + + var editor; function initEditor(element) { var $editorContainer = $(element); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); - var editor = new toastui.Editor({ + editor = new toastui.Editor({ el: $editorContainer[0], usageStatistics: false, useCommandShortcut: true, @@ -333,6 +334,11 @@ $(function () { }); } + $('#GeneratedWidgetText').click(function (e) { + var txt = $('#GeneratedWidgetText').val(); + editor.insertText(txt); + }); + function createAddWidgetButton() { const button = document.createElement('button'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index 98505c479e..eabba80ea4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -169,13 +169,14 @@ $(function () { }); } + var editor; function initEditor(element) { var $editorContainer = $(element); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); - var editor = new toastui.Editor({ + editor = new toastui.Editor({ el: $editorContainer[0], usageStatistics: false, useCommandShortcut: true, @@ -255,6 +256,11 @@ $(function () { ); }); + $('#GeneratedWidgetText').click(function (e) { + var txt = $('#GeneratedWidgetText').val(); + editor.insertText(txt); + }); + function createAddWidgetButton() { const button = document.createElement('button'); From c3bf6d08cd352978a5e567cc3172437600f743a7 Mon Sep 17 00:00:00 2001 From: malik masis Date: Sat, 9 Jul 2022 23:08:13 +0300 Subject: [PATCH 04/11] Fixed the Page's editor --- .../Pages/CmsKit/Pages/Update.cshtml | 1 + .../Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js | 4 ---- .../Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js | 8 +++++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml index ea6f8c9a1b..d24ad8bc06 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml @@ -83,3 +83,4 @@ + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 2ea6cea91a..2e0da6cc11 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -139,10 +139,6 @@ $(function () { } }); } - - //$('.ProseMirror').on('click', function (e) { - - //}); function uploadFile(blob, callback, source) { var UPPY_OPTIONS = { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js index f8b837cc1f..2b69fefd89 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js @@ -67,13 +67,14 @@ $(function () { }); } + var editor; function initEditor(element) { var $editorContainer = $(element); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); - var editor = new toastui.Editor({ + editor = new toastui.Editor({ el: $editorContainer[0], usageStatistics: false, useCommandShortcut: true, @@ -141,6 +142,11 @@ $(function () { }); } + $('#GeneratedWidgetText').click(function (e) { + var txt = $('#GeneratedWidgetText').val(); + editor.insertText(txt); + }); + function createAddWidgetButton() { const button = document.createElement('button'); From 751d9acf140e99542e4e1824b4b60ca32ffb0bf4 Mon Sep 17 00:00:00 2001 From: malik masis Date: Sat, 9 Jul 2022 23:08:46 +0300 Subject: [PATCH 05/11] Made editorWidgetName required --- .../Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs index 1ff76acf79..b87f286b5c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs @@ -11,7 +11,7 @@ public class CmsKitContentWidgetOptions WidgetConfigs = new(); } - public void AddWidget(string widgetKey, string widgetName, string editorWidgetName = null) + public void AddWidget(string widgetKey, string widgetName, string editorWidgetName) { var config = new ContentWidgetConfig(widgetName, editorWidgetName); WidgetConfigs.Add(widgetKey, config); From 746c9821c6677c23b46451111e53e7fb85ba50c4 Mon Sep 17 00:00:00 2001 From: malik masis Date: Sun, 10 Jul 2022 11:43:32 +0300 Subject: [PATCH 06/11] Added the required parameter to unit tests --- .../Contents/ContentParser_Test.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs index 108d883a70..b08a127111 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentParser_Test.cs @@ -20,8 +20,8 @@ public class ContentParser_Test : CmsKitDomainTestBase [Fact] public async Task ParseAsync_ShouldWorkWithDifferentWidgetTypes() { - _options.Value.AddWidget(testData.PollName, testData.WidgetName); - _options.Value.AddWidget("ImageGallery", "ImageGallery"); + _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); + _options.Value.AddWidget("ImageGallery", "ImageGallery", string.Empty); contentParser = new ContentParser(_options); var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. @@ -54,7 +54,7 @@ public class ContentParser_Test : CmsKitDomainTestBase [Fact] public async Task ParseAsync_ShouldWorkWithWrongConfigOptions() { - _options.Value.AddWidget(testData.WidgetName, testData.PollName); + _options.Value.AddWidget(testData.WidgetName, testData.PollName, string.Empty); contentParser = new ContentParser(_options); var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. @@ -70,7 +70,7 @@ public class ContentParser_Test : CmsKitDomainTestBase [Fact] public async Task ParseAsync_ShouldWorkWithWrongWidgetType() { - _options.Value.AddWidget(testData.PollName, testData.WidgetName); + _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); contentParser = new ContentParser(_options); var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. @@ -86,7 +86,7 @@ public class ContentParser_Test : CmsKitDomainTestBase [Fact] public async Task ParseAsync_ShouldWorkWithWrongPollName() { - _options.Value.AddWidget(testData.PollName, testData.WidgetName); + _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); contentParser = new ContentParser(_options); var content = @"**ABP Framework** is completely open source and developed in a community-driven manner. @@ -103,7 +103,7 @@ public class ContentParser_Test : CmsKitDomainTestBase [MemberData(nameof(ExampleData))] public async Task ParseAsync_ShouldWorkProperlyWithCorrectInputs(string content, int expectedLine) { - _options.Value.AddWidget(testData.PollName, testData.WidgetName); + _options.Value.AddWidget(testData.PollName, testData.WidgetName, string.Empty); contentParser = new ContentParser(_options); var widgets = await contentParser.ParseAsync(content); From 9e1257b1a726f5eb504244fbed39ef068c9d8105 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 11 Jul 2022 13:34:45 +0300 Subject: [PATCH 07/11] Create ContentAdminAppService_Tests.cs --- .../Contents/ContentAdminAppService_Tests.cs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs new file mode 100644 index 0000000000..f338d3d7d1 --- /dev/null +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs @@ -0,0 +1,27 @@ +using System.Linq; +using System.Threading.Tasks; +using Shouldly; +using Volo.CmsKit.Admin.Contents; +using Xunit; + +namespace Volo.CmsKit.Contents; + +public class ContentAdminAppService_Tests : CmsKitApplicationTestBase +{ + private readonly IContentAdminAppService _contentAdminAppService; + + public ContentAdminAppService_Tests() + { + _contentAdminAppService = GetRequiredService(); + } + + [Fact] + public async Task ShouldGet_PagedListAsync() + { + var widgets = await _contentAdminAppService.GetWidgetsAsync(); + + widgets.Items.Count.ShouldBe(0); + widgets.Items.Any().ShouldBeFalse(); + } + +} From 18a22d82093fc658f918e584f8bcaf1943ddc6e6 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Wed, 13 Jul 2022 10:37:49 +0300 Subject: [PATCH 08/11] Convert to single editor in BlogPost create page --- .../Pages/CmsKit/BlogPosts/create.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index 85c4ea9a07..c38882e4d8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -250,17 +250,12 @@ $(function () { var fileUploadUri = "/api/cms-kit-admin/media/blogpost"; var fileUriPrefix = "/api/cms-kit/media/"; - initAllEditors(); + initEditor(); - function initAllEditors() { - $('.content-editor').each(function (i, item) { - initEditor(item); - }); - } - var editor; - function initEditor(element) { - var $editorContainer = $(element); + + function initEditor() { + var $editorContainer = $("#ContentEditor"); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); From 83a9345935b547be3570d1c2efcc05f94f5d81ed Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 13 Jul 2022 10:49:20 +0300 Subject: [PATCH 09/11] Converted to single editor in the Page feature --- .../Pages/CmsKit/Pages/create.js | 16 +++++----------- .../Pages/CmsKit/Pages/update.js | 14 ++++---------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 2e0da6cc11..1346d70317 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -6,8 +6,6 @@ $(function () { var $slug = $('#ViewModel_Slug'); var $buttonSubmit = $('#button-page-create'); - initAllEditors(); - var widgetModal = new abp.ModalManager({ viewUrl: abp.appPath + "CmsKit/Contents/AddWidgetModal", modalClass: "addWidgetModal" }); var scriptEditor = CodeMirror.fromTextArea(document.getElementById("ViewModel_Script"), { @@ -91,15 +89,11 @@ $(function () { var fileUploadUri = "/api/cms-kit-admin/media/page"; var fileUriPrefix = "/api/cms-kit/media/"; - - function initAllEditors() { - $('.content-editor').each(function (i, item) { - initEditor(item); - }); - } + initEditor(); + var editor; - function initEditor(element) { - var $editorContainer = $(element); + function initEditor() { + var $editorContainer = $("#ContentEditor"); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); @@ -172,7 +166,7 @@ $(function () { }); } - $('#GeneratedWidgetText').click(function (e) { + $('#GeneratedWidgetText').click(function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js index 2b69fefd89..0ffe350013 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js @@ -59,17 +59,11 @@ $(function () { var fileUploadUri = "/api/cms-kit-admin/media/page"; var fileUriPrefix = "/api/cms-kit/media/"; - initAllEditors(); - - function initAllEditors() { - $('.content-editor').each(function (i, item) { - initEditor(item); - }); - } + initEditor(); var editor; - function initEditor(element) { - var $editorContainer = $(element); + function initEditor() { + var $editorContainer = $("#ContentEditor"); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); @@ -142,7 +136,7 @@ $(function () { }); } - $('#GeneratedWidgetText').click(function (e) { + $('#GeneratedWidgetText').click(function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); From 36af3dd685dd45ff532c6b98be49e26ae1a5046b Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 13 Jul 2022 10:49:52 +0300 Subject: [PATCH 10/11] Converted to single editor in the blogpost feature --- .../Pages/CmsKit/BlogPosts/create.js | 6 +++--- .../Pages/CmsKit/BlogPosts/update.js | 14 ++++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index c38882e4d8..51ae869a3f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -7,7 +7,7 @@ $(function () { Published: 1, SendToReview: 2 }; - + var $selectBlog = $('#BlogSelectionSelect'); var $formCreate = $('#form-blog-post-create'); var $title = $('#ViewModel_Title'); @@ -329,11 +329,11 @@ $(function () { }); } - $('#GeneratedWidgetText').click(function (e) { + $('#GeneratedWidgetText').click(function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); - + function createAddWidgetButton() { const button = document.createElement('button'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index eabba80ea4..f31a30d43c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -161,17 +161,11 @@ $(function () { var fileUploadUri = "/api/cms-kit-admin/media/blogpost"; var fileUriPrefix = "/api/cms-kit/media/"; - initAllEditors(); - - function initAllEditors() { - $('.content-editor').each(function (i, item) { - initEditor(item); - }); - } + initEditor(); var editor; - function initEditor(element) { - var $editorContainer = $(element); + function initEditor() { + var $editorContainer = $("#ContentEditor"); var inputName = $editorContainer.data('input-id'); var $editorInput = $('#' + inputName); var initialValue = $editorInput.val(); @@ -256,7 +250,7 @@ $(function () { ); }); - $('#GeneratedWidgetText').click(function (e) { + $('#GeneratedWidgetText').click(function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); From 0642959d4433a2337fdbdf822179776599ecdeb2 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 13 Jul 2022 12:22:10 +0300 Subject: [PATCH 11/11] Used `change` instead of `click` --- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js | 2 +- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js | 2 +- .../Pages/CmsKit/Contents/addWidgetModal.js | 2 +- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js | 3 +-- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index 51ae869a3f..375b7ad41b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -329,7 +329,7 @@ $(function () { }); } - $('#GeneratedWidgetText').click(function () { + $('#GeneratedWidgetText').on('change', function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index f31a30d43c..51e3eda96c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -250,7 +250,7 @@ $(function () { ); }); - $('#GeneratedWidgetText').click(function () { + $('#GeneratedWidgetText').on('change', function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); 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 3a1bdeb7f7..2c307c8faf 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 @@ -44,7 +44,7 @@ $(function () { } $('#GeneratedWidgetText').val(updatedText); - $("#GeneratedWidgetText").trigger("click"); + $("#GeneratedWidgetText").trigger("change"); $('#addWidgetModal').modal('hide'); }); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 1346d70317..49a482bf33 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -166,13 +166,12 @@ $(function () { }); } - $('#GeneratedWidgetText').click(function () { + $('#GeneratedWidgetText').on('change',function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); function createAddWidgetButton() { - //TODO add auth const button = document.createElement('button'); button.className = 'toastui-editor-toolbar-icons last dropdown'; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js index 0ffe350013..565f758552 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js @@ -136,7 +136,7 @@ $(function () { }); } - $('#GeneratedWidgetText').click(function () { + $('#GeneratedWidgetText').on('change', function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); });