Skip to content

revert(Bootstrap): revert dynamic load bootstrap module #6205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 11, 2025
Merged

revert(Bootstrap): revert dynamic load bootstrap module #6205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
697b1d2
chore: 更新自动化脚本
ArgoZhang Jun 11, 2025
c50243a
chore: bump version 9.7.2
ArgoZhang Jun 11, 2025
dca5219
Revert "chore: 更新自动化脚本"
ArgoZhang Jun 11, 2025
dde81e1
chore: 更新脚本
ArgoZhang Jun 11, 2025
ab291e0
Revert "feat(Bootstrap): support dynamic load bootstrap javascript (#…
ArgoZhang Jun 11, 2025
1270d85
revert: 撤销更改
ArgoZhang Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/BootstrapBlazor.Server/Components/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<BlazorReconnector @rendermode="new InteractiveServerRenderMode(false)" />

<script src="_content/BootstrapBlazor.SummerNote/js/jquery-3.6.0.min.js"></script>
<script src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></script>
<script src="_framework/blazor.web.js"></script>
@if (Env.IsProduction())
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.7.1</Version>
<Version>9.7.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/AnchorLink/AnchorLink.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../../js/bootstrap.blazor.bundle.min.js'
import { copy } from "../../modules/utility.js"
import { copy } from "../../modules/utility.js"
import Data from "../../modules/data.js"
import EventHandler from "../../modules/event-handler.js"

Expand Down
4 changes: 1 addition & 3 deletions src/BootstrapBlazor/Components/Button/Button.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import '../../js/bootstrap.blazor.bundle.min.js'

const showTooltip = (id, title) => {
const showTooltip = (id, title) => {
const el = document.getElementById(id)

if (el) {
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Layout/Layout.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../../js/bootstrap.blazor.bundle.min.js'
import Data from "../../modules/data.js"
import Data from "../../modules/data.js"
import EventHandler from "../../modules/event-handler.js"

export function init(id, invoke, callback) {
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Modal/Modal.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../../js/bootstrap.blazor.bundle.min.js'
import Data from "../../modules/data.js"
import Data from "../../modules/data.js"
import EventHandler from "../../modules/event-handler.js"

export function init(id, invoke, shownCallback, closeCallback) {
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Popover/Popover.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../../js/bootstrap.blazor.bundle.min.js'
import { getDescribedElement, hackTooltip } from "../../modules/utility.js"
import { getDescribedElement, hackTooltip } from "../../modules/utility.js"
import EventHandler from "../../modules/event-handler.js"

export function init(id, options) {
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Segmented/Segmented.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../../js/bootstrap.blazor.bundle.min.js'
import Data from '../../modules/data.js'
import Data from '../../modules/data.js'
import EventHandler from '../../modules/event-handler.js'

export function init(id, invoke) {
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/wwwroot/modules/base-popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../js/bootstrap.blazor.bundle.min.js'
import { getDescribedElement, getDescribedOwner, hackTooltip, hackPopover, isDisabled, registerBootstrapBlazorModule } from "./utility.js"
import { getDescribedElement, getDescribedOwner, hackTooltip, hackPopover, isDisabled, registerBootstrapBlazorModule } from "./utility.js"
import EventHandler from "./event-handler.js"

const Popover = {
Expand Down
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/wwwroot/modules/utility.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '../js/bootstrap.blazor.bundle.min.js'
import EventHandler from "./event-handler.js"
import EventHandler from "./event-handler.js"

const vibrate = () => {
if ('vibrate' in window.navigator) {
Expand Down