From eff8f583df4d179077a502c02a388a4e5ebc93e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 5 Apr 2020 14:47:19 +0300 Subject: [PATCH] Fix tui-editor script contributor. --- .../Packages/TuiEditor/TuiEditorScriptContributor.cs | 11 ++++++++++- npm/packs/tui-editor/abp.resourcemapping.js | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) 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 586bcd3db9..e788c612cf 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 @@ -17,7 +17,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor public override void ConfigureBundle(BundleConfigurationContext context) { context.Files.AddIfNotContains("/libs/to-mark/to-mark.min.js"); - context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.min.js"); + + if (context.FileProvider.GetFileInfo("/libs/tui-code-snippet/tui-code-snippet.min.js").Exists) + { + context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.min.js"); + } + else + { + context.Files.AddIfNotContains("/libs/tui-code-snippet/tui-code-snippet.js"); + } + context.Files.AddIfNotContains("/libs/squire-rte/squire.js"); context.Files.AddIfNotContains("/libs/tui-editor/tui-editor-Editor.min.js"); } diff --git a/npm/packs/tui-editor/abp.resourcemapping.js b/npm/packs/tui-editor/abp.resourcemapping.js index 9263853c1d..53a3e493f7 100644 --- a/npm/packs/tui-editor/abp.resourcemapping.js +++ b/npm/packs/tui-editor/abp.resourcemapping.js @@ -1,7 +1,7 @@ module.exports = { mappings: { "@node_modules/to-mark/dist/to-mark.min.js": "@libs/to-mark/", - "@node_modules/tui-code-snippet/dist/tui-code-snippet.min.js": "@libs/tui-code-snippet/", + "@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/" }