From ca0f95a6fc96f9e7e8e741a329a37b563e1b457f Mon Sep 17 00:00:00 2001 From: wen Date: Wed, 21 Aug 2024 11:45:36 +0800 Subject: [PATCH] fix doupdate use confirm script --- presets/detailing.go | 2 +- presets/editing.go | 2 +- presets/presets.go | 3 ++- publish/version_listener.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/presets/detailing.go b/presets/detailing.go index 4b6609659..e82ecf7f5 100644 --- 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 index faf339632..e2c7718b1 100644 --- 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 index 2aff80c2c..c8add34d9 100644 --- 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 index 77f34b2ef..733a25cba 100644 --- 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(),