Skip to content

Commit 5f05ce4

Browse files
committed
Update to latest version of Blazorise & roosterjs
1 parent 44dde9c commit 5f05ce4

File tree

5 files changed

+1374
-10
lines changed

5 files changed

+1374
-10
lines changed

Blazorise.sln

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3939
ProjectSection(SolutionItems) = preProject
4040
.editorconfig = .editorconfig
4141
.runsettings = .runsettings
42-
DotnetWatchRunAll.bat = DotnetWatchRunAll.bat
4342
CREDITS.md = CREDITS.md
43+
DotnetWatchRunAll.bat = DotnetWatchRunAll.bat
4444
README.md = README.md
4545
EndProjectSection
4646
EndProject
@@ -153,7 +153,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazorise.Captcha", "Source
153153
EndProject
154154
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazorise.Captcha.ReCaptcha", "Source\Extensions\Blazorise.Captcha.ReCaptcha\Blazorise.Captcha.ReCaptcha.csproj", "{2B4FD79A-42E2-4B81-828B-0799E4744ADA}"
155155
EndProject
156-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blazorise.RichTextEdit.Rooster", "Source\Extensions\Blazorise.RichTextEdit.Rooster\Blazorise.RichTextEdit.Rooster.csproj", "{D03708E9-0E38-4AD1-87DF-DA349E7DC271}"
156+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazorise.RichTextEdit.Rooster", "Source\Extensions\Blazorise.RichTextEdit.Rooster\Blazorise.RichTextEdit.Rooster.csproj", "{D03708E9-0E38-4AD1-87DF-DA349E7DC271}"
157157
EndProject
158158
Global
159159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -401,6 +401,10 @@ Global
401401
{2B4FD79A-42E2-4B81-828B-0799E4744ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
402402
{2B4FD79A-42E2-4B81-828B-0799E4744ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
403403
{2B4FD79A-42E2-4B81-828B-0799E4744ADA}.Release|Any CPU.Build.0 = Release|Any CPU
404+
{D03708E9-0E38-4AD1-87DF-DA349E7DC271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
405+
{D03708E9-0E38-4AD1-87DF-DA349E7DC271}.Debug|Any CPU.Build.0 = Debug|Any CPU
406+
{D03708E9-0E38-4AD1-87DF-DA349E7DC271}.Release|Any CPU.ActiveCfg = Release|Any CPU
407+
{D03708E9-0E38-4AD1-87DF-DA349E7DC271}.Release|Any CPU.Build.0 = Release|Any CPU
404408
EndGlobalSection
405409
GlobalSection(SolutionProperties) = preSolution
406410
HideSolutionNode = FALSE
@@ -469,6 +473,7 @@ Global
469473
{FE5BCD94-0215-4BF1-8CF7-0F97C20B0054} = {9731051E-0AA7-411E-A76A-987854F034DA}
470474
{D24EA4EF-0AEC-43B2-BCDC-56229D60C285} = {9731051E-0AA7-411E-A76A-987854F034DA}
471475
{2B4FD79A-42E2-4B81-828B-0799E4744ADA} = {9731051E-0AA7-411E-A76A-987854F034DA}
476+
{D03708E9-0E38-4AD1-87DF-DA349E7DC271} = {9731051E-0AA7-411E-A76A-987854F034DA}
472477
EndGlobalSection
473478
GlobalSection(ExtensibilityGlobals) = postSolution
474479
SolutionGuid = {205B3EA4-470F-45DA-911E-346AF7D0A9A5}

Build/Blazorise.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Company>Megabit</Company>
1515
<Copyright>Copyright 2018-2024 Megabit</Copyright>
1616

17-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
17+
<TargetFramework>net8.0</TargetFramework>
1818
<OutputType>Library</OutputType>
1919
<IsPackable>true</IsPackable>
2020
<LangVersion>10.0</LangVersion>

Source/Extensions/Blazorise.RichTextEdit.Rooster/wwwroot/blazorise.rooster.js

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { getRequiredElement, loadScript } from "../Blazorise/utilities.js?v=1.2.2.0";
1+
import { getRequiredElement } from "../Blazorise/utilities.js?v=1.4.2.0";
22

33
const _instances = [];
44

5-
document.getElementsByTagName("head")[0].insertAdjacentHTML("beforeend", "<link rel=\"stylesheet\" href=\"_content/Blazorise.RichTextEdit.Rooster/blazorise.rooster.css?v=1.2.2.0\" />");
5+
document.getElementsByTagName("head")[0].insertAdjacentHTML("beforeend", "<link rel=\"stylesheet\" href=\"_content/Blazorise.RichTextEdit.Rooster/blazorise.rooster.css?v=1.4.2.0\" />");
66

77
export async function initialize(dotNetAdapter, element, elementId, options) {
88
element = getRequiredElement(element, elementId);
@@ -11,10 +11,10 @@ export async function initialize(dotNetAdapter, element, elementId, options) {
1111
return;
1212

1313
if (typeof roosterjs === 'undefined') {
14-
await loadScript("_content/Blazorise.RichTextEdit.Rooster/vendors/rooster.js?v=4.88.0");
14+
await loadRoosterJs();
1515
}
1616

17-
const instance = {
17+
const instance = {
1818
options: options,
1919
adapter: dotNetAdapter,
2020
editor: null,
@@ -48,3 +48,28 @@ export function format(element, elementId, action, args) {
4848
roosterjs[action](instance.editor, args);
4949
}
5050

51+
function loadRoosterJs() {
52+
return new Promise((resolve, reject) => {
53+
try {
54+
const scriptEle = document.createElement("script");
55+
scriptEle.type = "text/javascript";
56+
scriptEle.async = true;
57+
scriptEle.src = "_content/Blazorise.RichTextEdit.Rooster/vendors/rooster.js?v=1.4.2.0";
58+
59+
scriptEle.addEventListener("load", (ev) => {
60+
resolve({ status: true });
61+
});
62+
63+
scriptEle.addEventListener("error", (ev) => {
64+
reject({
65+
status: false,
66+
message: `Failed to load roosterjs`
67+
});
68+
});
69+
70+
document.body.appendChild(scriptEle);
71+
} catch (error) {
72+
reject(error);
73+
}
74+
});
75+
}

Source/Extensions/Blazorise.RichTextEdit.Rooster/wwwroot/vendors/rooster.js

Lines changed: 1337 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Extensions/Blazorise.RichTextEdit.Rooster/wwwroot/vendors/rooster.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)