Skip to content

Commit 7efe65e

Browse files
committed
Merge branch 'main' into test
# Conflicts: # src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj # src/BootstrapBlazor/BootstrapBlazor.csproj
2 parents f4884b9 + f54ef56 commit 7efe65e

96 files changed

Lines changed: 1756 additions & 249 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.

exclusion.dic

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,8 @@ Pharmacode
109109
bluetooth
110110
iframe
111111
Sqlite
112+
maxlength
113+
inputmode
114+
Totp
115+
otpauth
116+
Hotp

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.3" />
24+
<PackageReference Include="BootstrapBlazor.Authenticator" Version="9.0.0" />
2425
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0" />
2526
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0" />
2627
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0" />
@@ -32,7 +33,7 @@
3233
<PackageReference Include="BootstrapBlazor.ChatBot" Version="9.0.0" />
3334
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
3435
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
35-
<PackageReference Include="BootstrapBlazor.DockView" Version="9.1.10" />
36+
<PackageReference Include="BootstrapBlazor.DockView" Version="9.1.11" />
3637
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.3" />
3738
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.3" />
3839
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
@@ -46,15 +47,16 @@
4647
<PackageReference Include="BootstrapBlazor.IP2Region" Version="9.0.1" />
4748
<PackageReference Include="BootstrapBlazor.JuHeIpLocatorProvider" Version="9.0.0" />
4849
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.1" />
49-
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.1" />
50+
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.2" />
5051
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.1" />
5152
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.1.9" />
5253
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.4" />
54+
<PackageReference Include="BootstrapBlazor.Middleware" Version="9.0.0" />
5355
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.6" />
5456
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
5557
<PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.4" />
5658
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
57-
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
59+
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.1" />
5860
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
5961
<PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
6062
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
@@ -63,16 +65,12 @@
6365
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.2" />
6466
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
6567
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.3" />
66-
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.3" />
68+
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
6769
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
6870
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
6971
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.3" />
7072
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
7173
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
72-
</ItemGroup>
73-
74-
<ItemGroup>
75-
<PackageReference Include="BootstrapBlazor.Middleware" Version="9.0.0" />
7674
<PackageReference Include="Longbow.Logging" Version="9.0.0" />
7775
<PackageReference Include="Longbow.Tasks" Version="9.0.0" />
7876
</ItemGroup>

src/BootstrapBlazor.Server/Components/Components/CustomWinBoxContent.razor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
55

6-
using Microsoft.Extensions.Options;
7-
86
namespace BootstrapBlazor.Server.Components.Components;
97

108
/// <summary>

src/BootstrapBlazor.Server/Components/Components/Pre.razor.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ export function dispose(id) {
110110
EventHandler.off(el, 'click', '.btn-minus');
111111

112112
const { Pre } = window.BootstrapBlazor;
113-
Pre.dispose(id, () => {
114-
EventHandler.off(document, 'changed.bb.theme', updateTheme);
115-
});
113+
if (Pre) {
114+
Pre.dispose(id, () => {
115+
EventHandler.off(document, 'changed.bb.theme', updateTheme);
116+
});
117+
}
116118
}

src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
55

6-
using Microsoft.Extensions.Options;
76
using System.Globalization;
87

98
namespace BootstrapBlazor.Server.Components.Layout;

src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span class="sidebar-text">Bootstrap Blazor</span>
1111
</div>
1212
<NavMenu />
13-
<LayoutSplitebar Min="250" Max="380" ContainerSelector=".section"></LayoutSplitebar>
13+
<LayoutSplitBar Min="250" Max="380" ContainerSelector=".section"></LayoutSplitBar>
1414
</aside>
1515

1616
<section class="main">

src/BootstrapBlazor.Server/Components/Layout/TutorialsLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
<TutorialsNavMenu></TutorialsNavMenu>
1111
<Wwads IsVertical="true"></Wwads>
12-
<LayoutSplitebar Min="220" Max="330" ContainerSelector=".section"></LayoutSplitebar>
12+
<LayoutSplitBar Min="220" Max="330" ContainerSelector=".section"></LayoutSplitBar>
1313
</aside>
1414

1515
<section class="main">

src/BootstrapBlazor.Server/Components/Samples/Avatars.razor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
55

6-
using Microsoft.Extensions.Options;
7-
86
namespace BootstrapBlazor.Server.Components.Samples;
97

108
/// <summary>

src/BootstrapBlazor.Server/Components/Samples/IntersectionObservers.razor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
55

6-
using Microsoft.Extensions.Options;
7-
86
namespace BootstrapBlazor.Server.Components.Samples;
97

108
/// <summary>

src/BootstrapBlazor.Server/Components/Samples/Layouts.razor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ private AttributeItem[] GetAttributes() =>
141141
},
142142
new()
143143
{
144-
Name = "ShowSplitebar",
145-
Description = Localizer["Layouts_ShowSplitebar_Description"],
144+
Name = "ShowSplitBar",
145+
Description = Localizer["Layouts_ShowSplitBar_Description"],
146146
Type = "bool",
147147
ValueList = "true|false",
148148
DefaultValue = "false"

0 commit comments

Comments
 (0)