Merge pull request #502 from qor5/fix-updateConfirm

fix doupdate use confirm script
qor5 · Aug 21, 2024 · 594e79c · 594e79c
2 parents 306c4a6 + ca0f95a
commit 594e79c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/presets/detailing.go b/presets/detailing.go
@@ -282,7 +282,7 @@ func (b *DetailingBuilder) showInDrawer(ctx *web.EventContext) (r web.EventRespo
 	onChangeEvent := fmt.Sprintf("if (vars.%s) { vars.%s.detailing=true };", VarsPresetsDataChanged, VarsPresetsDataChanged)
 
 	overlayType := ctx.R.FormValue(ParamOverlay)
-	closeBtnVarScript := CloseRightDrawerVarScript
+	closeBtnVarScript := CloseRightDrawerVarConfirmScript
 	style := DetailingStyleDrawer
 	if overlayType == actions.Dialog {
 		closeBtnVarScript = CloseDialogVarScript

diff --git a/presets/editing.go b/presets/editing.go
@@ -362,7 +362,7 @@ func (b *EditingBuilder) editFormFor(obj interface{}, ctx *web.EventContext) h.H
 		sidePanel:   b.sidePanel,
 	}, obj, ctx)
 
-	closeBtnVarScript := CloseRightDrawerVarScript
+	closeBtnVarScript := CloseRightDrawerVarConfirmScript
 	if overlayType == actions.Dialog {
 		closeBtnVarScript = CloseDialogVarScript
 	}

diff --git a/presets/presets.go b/presets/presets.go
@@ -824,10 +824,11 @@ const (
 )
 
 var (
-	CloseRightDrawerVarScript = ConfirmLeaveScript("vars.confirmDrawerLeave=true;", "vars.presetsRightDrawer = false;")
+	CloseRightDrawerVarConfirmScript = ConfirmLeaveScript("vars.confirmDrawerLeave=true;", "vars.presetsRightDrawer = false;")
 )
 
 const (
+	CloseRightDrawerVarScript   = "vars.presetsRightDrawer = false"
 	CloseDialogVarScript        = "vars.presetsDialog = false"
 	CloseListingDialogVarScript = "vars.presetsListingDialog = false"
 )

diff --git a/publish/version_listener.go b/publish/version_listener.go
@@ -45,7 +45,7 @@ func NewListenerVersionSelected(evCtx *web.EventContext, mb *presets.ModelBuilde
 	`,
 		slug,
 		strings.Join([]string{
-			presets.CloseRightDrawerVarScript,
+			presets.CloseRightDrawerVarConfirmScript,
 			drawerToSlug.Go(),
 		}, ";"),
 		web.Plaid().PushState(true).URL(web.Var(fmt.Sprintf(`%q + "/" + payload.slug`, mb.Info().ListingHref()))).Go(),