From c77583cdb2a98546a167b9842915483ea19e3057 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 14 Apr 2021 16:56:02 +0800 Subject: [PATCH] Replaced tui-editor with toast-ui editor --- .../UI/Packages/TuiEditor/TuiEditorScriptContributor.cs | 3 +-- .../Mvc/UI/Packages/TuiEditor/TuiEditorStyleContributor.cs | 5 ++--- npm/packs/tui-editor/abp.resourcemapping.js | 3 +-- npm/packs/tui-editor/package.json | 4 ++-- npm/packs/tui-editor/src/tui-editor-jquery-patch.js | 7 ------- 5 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 npm/packs/tui-editor/src/tui-editor-jquery-patch.js diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs index e2e826445f..a6342c6276 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorScriptContributor.cs @@ -16,7 +16,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.AddIfNotContains("/libs/tui-editor/tui-editor-jquery-patch.js"); context.Files.AddIfNotContains("/libs/to-mark/to-mark.min.js"); if (context.FileProvider.GetFileInfo("/libs/tui-code-snippet/tui-code-snippet.min.js").Exists) @@ -29,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor } context.Files.AddIfNotContains("/libs/squire-rte/squire.js"); - context.Files.AddIfNotContains("/libs/tui-editor/tui-editor-Editor.min.js"); + context.Files.AddIfNotContains("/libs/tui-editor/toastui-editor.js"); } } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorStyleContributor.cs index 64f818ad6d..a620b77d8a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorStyleContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/TuiEditor/TuiEditorStyleContributor.cs @@ -14,8 +14,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.AddIfNotContains("/libs/tui-editor/tui-editor.min.css"); - context.Files.AddIfNotContains("/libs/tui-editor/tui-editor-contents.min.css"); + context.Files.AddIfNotContains("/libs/tui-editor/toastui-editor.css"); } } -} \ No newline at end of file +} diff --git a/npm/packs/tui-editor/abp.resourcemapping.js b/npm/packs/tui-editor/abp.resourcemapping.js index a1d944d7f1..0ef68b1525 100644 --- a/npm/packs/tui-editor/abp.resourcemapping.js +++ b/npm/packs/tui-editor/abp.resourcemapping.js @@ -3,7 +3,6 @@ "@node_modules/to-mark/dist/to-mark.min.js": "@libs/to-mark/", "@node_modules/tui-code-snippet/dist/*.*": "@libs/tui-code-snippet/", "@node_modules/squire-rte/build/squire.js": "@libs/squire-rte/", - "@node_modules/tui-editor/dist/*.*": "@libs/tui-editor/", - "@node_modules/@abp/tui-editor/src/*.*": "@libs/tui-editor/" + "@node_modules/@toast-ui/editor/dist/*.*": "@libs/tui-editor/" } } \ No newline at end of file diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index a6977a9289..e09fc37145 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -9,8 +9,8 @@ "@abp/highlight.js": "~4.3.0-rc.2", "@abp/jquery": "~4.3.0-rc.2", "@abp/markdown-it": "~4.3.0-rc.2", - "tui-code-snippet": "1.5.2", - "tui-editor": "^1.4.10" + "tui-code-snippet": "^2.3.2", + "@toast-ui/editor": "^2.5.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/tui-editor/src/tui-editor-jquery-patch.js b/npm/packs/tui-editor/src/tui-editor-jquery-patch.js deleted file mode 100644 index 1033d18992..0000000000 --- a/npm/packs/tui-editor/src/tui-editor-jquery-patch.js +++ /dev/null @@ -1,7 +0,0 @@ -/* - https://jquery.com/upgrade-guide/3.5/#jquery-htmlprefilter-changes -*/ -var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi; -jQuery.htmlPrefilter = function( html ) { - return html.replace( rxhtmlTag, "<$1>" ); -};