Skip to content

Commit 98f34e9

Browse files
committed
Merge branch 'master' into feat-editor
# Conflicts: # src/components/BootstrapBlazor.CodeEditor/BootstrapBlazor.CodeEditor.csproj
2 parents f15eafd + 9f653e4 commit 98f34e9

236 files changed

Lines changed: 25059 additions & 43173 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/components/BootstrapBlazor.CodeEditor/BootstrapBlazor.CodeEditor.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Razor">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.0.2</Version>
4+
<Version>9.0.3</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/components/BootstrapBlazor.CodeEditor/Components/CodeEditor/CodeEditor.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace BootstrapBlazor.Components;
1111
/// </summary>
1212
public partial class CodeEditor
1313
{
14-
private const string MONACO_VS_PATH = "./_content/BootstrapBlazor.CodeEditor/monaco-editor/min/vs";
14+
private const string MONACO_VS_PATH = "/_content/BootstrapBlazor.CodeEditor/monaco-editor/min/vs";
1515

1616
/// <summary>
1717
/// Language used by the editor: csharp, javascript, ...

src/components/BootstrapBlazor.CodeEditor/Components/CodeEditor/CodeEditor.razor.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export async function init(id, interop, options) {
77
Data.set(id, editor);
88

99
await addLink('_content/BootstrapBlazor.CodeEditor/code-editor.bundle.css');
10-
await addScript('_content/BootstrapBlazor.CodeEditor/monaco-editor/min/vs/loader.min.js');
10+
await addScript('_content/BootstrapBlazor.CodeEditor/monaco-editor/min/vs/loader.js');
1111

1212
const init = container => {
1313

@@ -45,9 +45,22 @@ export async function init(id, interop, options) {
4545
});
4646
}
4747

48+
const protocol = window.location.protocol;
49+
const host = window.location.hostname;
50+
const port = window.location.port;
51+
let fullDomain = "";
52+
53+
if (port === "80" && protocol === "http:") {
54+
fullDomain = `${protocol}//${host}`;
55+
} else if (port === "443" && protocol === "https:") {
56+
fullDomain = `${protocol}//${host}`;
57+
} else {
58+
fullDomain = `${protocol}//${host}:${port}`;
59+
}
60+
4861
// require is provided by loader.min.js.
4962
require.config({
50-
paths: { 'vs': options.path }
63+
paths: {'vs': `${fullDomain}${options.path}`}
5164
});
5265

5366
require(["vs/editor/editor.main"], () => {

src/components/BootstrapBlazor.CodeEditor/wwwroot/monaco-editor/min/vs/base/common/worker/simpleWorker.nls.de.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/BootstrapBlazor.CodeEditor/wwwroot/monaco-editor/min/vs/base/common/worker/simpleWorker.nls.de.min.js

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

src/components/BootstrapBlazor.CodeEditor/wwwroot/monaco-editor/min/vs/base/common/worker/simpleWorker.nls.es.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/BootstrapBlazor.CodeEditor/wwwroot/monaco-editor/min/vs/base/common/worker/simpleWorker.nls.es.min.js

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

src/components/BootstrapBlazor.CodeEditor/wwwroot/monaco-editor/min/vs/base/common/worker/simpleWorker.nls.fr.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/BootstrapBlazor.CodeEditor/wwwroot/monaco-editor/min/vs/base/common/worker/simpleWorker.nls.fr.min.js

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

0 commit comments

Comments
 (0)