From 98d7a5a35d9aecad538d70070e500b54d611a27c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 6 Mar 2025 15:40:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Modal/Modal.razor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.js index a4256de4c75..f33addd8c2e 100644 --- a/src/BootstrapBlazor/Components/Modal/Modal.razor.js +++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.js @@ -154,13 +154,13 @@ export function dispose(id) { } const backupBodyStyle = modal => { - if(modal.originalStyle === void 0) { + if (modal.originalStyle === null) { modal.originalStyle = document.body.style.cssText; } } const restoreBodyStyle = modal => { - if(modal.originalStyle !== void 0) { + if (modal.originalStyle !== null) { document.body.style.cssText = modal.originalStyle; delete modal.originalStyle; } From e3edf87484af9d776528b9203b4fda3cc6467696 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 6 Mar 2025 15:47:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Modal/Modal.razor.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.js index f33addd8c2e..0f3aeff23c8 100644 --- a/src/BootstrapBlazor/Components/Modal/Modal.razor.js +++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.js @@ -22,13 +22,6 @@ export function init(id, invoke, shownCallback, closeCallback) { }) EventHandler.on(el, 'hidden.bs.modal', e => { e.stopPropagation(); - if (modal.draggable) { - modal.dialog.style.width = '' - modal.dialog.style.margin = '' - - EventHandler.off(modal.dialog, 'mousedown') - EventHandler.off(modal.dialog, 'touchstart') - } invoke.invokeMethodAsync(closeCallback) }) EventHandler.on(window, 'popstate', modal.pop) From 36de22e2ebd9fe72bef620a5db920869ef0a6716 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 6 Mar 2025 15:47:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Components/Samples/Modals.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Modals.razor b/src/BootstrapBlazor.Server/Components/Samples/Modals.razor index c9b12342b67..8df2bf96ae2 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Modals.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Modals.razor @@ -237,7 +237,7 @@ Name="IsDraggable"> - +
@Localizer["ModalsTitlePopupWindowText"]
From 7c6ba933aa6224320558d00b599e185ebea06569 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 6 Mar 2025 15:51:01 +0800 Subject: [PATCH 4/4] chore: bump version 9.4.7-beta04 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index a53e555c293..893b793eefa 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.4.7-beta03 + 9.4.7-beta04