From ec41fe3adebc1f674dea6e9d75d0b74c4b2851a0 Mon Sep 17 00:00:00 2001 From: Ethan Date: Fri, 30 Aug 2024 16:54:34 +0800 Subject: [PATCH] fix string format --- media/filechooser.go | 8 ++++---- pagebuilder/builder.go | 2 +- pagebuilder/model_events.go | 4 ++-- pagebuilder/settings.go | 8 ++++---- pagebuilder/template.go | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/media/filechooser.go b/media/filechooser.go index 8effc6555..3a83ed178 100644 --- a/media/filechooser.go +++ b/media/filechooser.go @@ -292,7 +292,7 @@ func fileComponent( Go()), ), ) - clickEvent := fmt.Sprintf(`vars.imageSrc="%s";vars.imagePreview=true;`, src) + clickEvent := fmt.Sprintf(`vars.imageSrc=%q;vars.imagePreview=true;`, src) if base.IsImageFormat(f.File.FileName) && inMediaLibrary { *event = clickEvent } @@ -711,9 +711,9 @@ func mediaLibraryContent(mb *Builder, field string, ctx *web.EventContext, VTab(h.Text(msgr.Folders)).Value(tabFolders), ).Attr("v-model", "tabLocals.tab"). Attr("@update:model-value", - fmt.Sprintf(`$event=="%s"?null:%v`, tab, clickTabEvent), + fmt.Sprintf(`$event==%q?null:%v`, tab, clickTabEvent), ), - ).VSlot(`{locals:tabLocals}`).Init(fmt.Sprintf(`{tab:"%s"}`, tab)), + ).VSlot(`{locals:tabLocals}`).Init(fmt.Sprintf(`{tab:%q}`, tab)), ), ), ), @@ -891,7 +891,7 @@ func searchComponent(ctx *web.EventContext, field string, cfg *media_library.Med HideDetails(true). SingleLine(true). Attr("v-model", "vars.searchMsg"). - Attr(web.VAssign("vars", fmt.Sprintf(`{searchMsg:"%s"}`, ctx.Param(searchKeywordName(field))))...). + Attr(web.VAssign("vars", fmt.Sprintf(`{searchMsg:%q}`, ctx.Param(searchKeywordName(field))))...). Attr("@click:clear", `vars.searchMsg="";`+event). Attr("@keyup.enter", event). Children( diff --git a/pagebuilder/builder.go b/pagebuilder/builder.go index 1d944fe4c..fe30a46c4 100644 --- a/pagebuilder/builder.go +++ b/pagebuilder/builder.go @@ -1321,7 +1321,7 @@ func (b *Builder) deviceToggle(ctx *web.EventContext) h.HTMLComponent { Attr("v-model", "toggleLocals.activeDevice"). Attr("@update:model-value", web.Plaid().EventFunc(ReloadRenderPageOrTemplateEvent). PushState(true).MergeQuery(true).Query(paramsDevice, web.Var("toggleLocals.activeDevice")).Go()), - ).VSlot("{ locals : toggleLocals}").Init(fmt.Sprintf(`{activeDevice: "%s"}`, device)) + ).VSlot("{ locals : toggleLocals}").Init(fmt.Sprintf(`{activeDevice: %q}`, device)) } func (b *Builder) getModelBuilder(mb *presets.ModelBuilder) *ModelBuilder { diff --git a/pagebuilder/model_events.go b/pagebuilder/model_events.go index 6d314536b..d078028f2 100644 --- a/pagebuilder/model_events.go +++ b/pagebuilder/model_events.go @@ -169,11 +169,11 @@ func (b *ModelBuilder) renderContainersSortedList(ctx *web.EventContext) (r h.HT ), ), ).Name("append"), - ).Attr(":variant", fmt.Sprintf(` element.hidden &&!isHovering && !element.editShow?"%s":"%s"`, VariantPlain, VariantText)). + ).Attr(":variant", fmt.Sprintf(` element.hidden &&!isHovering && !element.editShow?%q:%q`, VariantPlain, VariantText)). Attr(":class", fmt.Sprintf(`element.container_data_id==vars.%s && !element.hidden?"bg-%s":""`, paramContainerDataID, ColorPrimaryLighten2)). Attr("v-bind", "props", "@click", clickColumnEvent). Attr(web.VAssign("vars", - fmt.Sprintf(`{%s:"%s"}`, paramContainerDataID, ctx.Param(paramContainerDataID)))...), + fmt.Sprintf(`{%s:%q}`, paramContainerDataID, ctx.Param(paramContainerDataID)))...), ).Name("default").Scope("{ isHovering, props }"), ), VDivider(), diff --git a/pagebuilder/settings.go b/pagebuilder/settings.go index 0272b18d5..fb1a84a77 100644 --- a/pagebuilder/settings.go +++ b/pagebuilder/settings.go @@ -71,12 +71,12 @@ func overview(m *ModelBuilder) presets.FieldComponentFunc { Count(&containerCount) var copyURL string if p, ok := obj.(publish.StatusInterface); ok { - copyURL = fmt.Sprintf(`$event.view.window.location.origin+"%s"`, previewDevelopUrl) + copyURL = fmt.Sprintf(`$event.view.window.location.origin+%q`, previewDevelopUrl) if p.EmbedStatus().Status == publish.StatusOnline { onlineHint = VAlert(h.Text(msgr.OnlineHit)). Density(DensityCompact).Type(TypeInfo).Variant(VariantTonal).Closable(true).Class("mb-2") previewDevelopUrl = b.publisher.FullUrl(p.EmbedStatus().OnlineUrl) - copyURL = fmt.Sprintf(`"%s"`, previewDevelopUrl) + copyURL = fmt.Sprintf(`%q`, previewDevelopUrl) } } return h.Div( @@ -118,7 +118,7 @@ transform-origin: 0 0; transform:scale(0.5);width:200%;height:200%`), h.Div( h.A(h.Text(previewDevelopUrl)).Href(previewDevelopUrl), VBtn("").Icon("mdi-content-copy").Color(ColorSecondary).Width(20).Height(20).Variant(VariantText).Size(SizeXSmall).Class("ml-1 fix-btn-icon"). - Attr("@click", fmt.Sprintf(`$event.view.window.navigator.clipboard.writeText(%s);vars.presetsMessage = { show: true, message: "success", color: "%s"}`, copyURL, ColorSuccess)), + Attr("@click", fmt.Sprintf(`$event.view.window.navigator.clipboard.writeText(%s);vars.presetsMessage = { show: true, message: "success", color: %q}`, copyURL, ColorSuccess)), ).Class("d-inline-flex align-center py-4"), ).Class("my-10") } @@ -184,7 +184,7 @@ func detailPageEditor(dp *presets.DetailingBuilder, b *Builder) { } msgr := i18n.MustGetModuleMessages(ctx.R, I18nPageBuilderKey, Messages_en_US).(*Messages) return h.Div( - detailingRow(msgr.Title, h.Text(p.Title)).Attr(web.VAssign("vars", fmt.Sprintf(`{pageTitle:"%s"}`, p.Title))...), + detailingRow(msgr.Title, h.Text(p.Title)).Attr(web.VAssign("vars", fmt.Sprintf(`{pageTitle:%q}`, p.Title))...), detailingRow(msgr.Slug, h.Text(p.Slug)), detailingRow(msgr.Category, h.Text(category.Path)), ) diff --git a/pagebuilder/template.go b/pagebuilder/template.go index fb33182c1..f8b25ed79 100644 --- a/pagebuilder/template.go +++ b/pagebuilder/template.go @@ -353,7 +353,7 @@ func (b *TemplateBuilder) searchComponent(ctx *web.EventContext) h.HTMLComponent HideDetails(true). SingleLine(true). Attr("v-model", "vars.searchMsg"). - Attr(web.VAssign("vars", fmt.Sprintf(`{searchMsg:"%s"}`, ctx.Param(ParamSearchKeyword)))...). + Attr(web.VAssign("vars", fmt.Sprintf(`{searchMsg:%q}`, ctx.Param(ParamSearchKeyword)))...). Attr("@click:clear", `vars.searchMsg="";`+clickEvent). Attr("@keyup.enter", clickEvent). Children( @@ -396,7 +396,7 @@ func (b *TemplateBuilder) selectedTemplate(ctx *web.EventContext) h.HTMLComponen h.Div( h.Span(name).Class("text-caption"), ).Class("mt-2"), - ).Class("mb-6").Attr(web.VAssign("form", fmt.Sprintf(`{%s:"%s"}`, ParamTemplateSelectedID, selectID))...) + ).Class("mb-6").Attr(web.VAssign("form", fmt.Sprintf(`{%s:%q}`, ParamTemplateSelectedID, selectID))...) } type TemplateSelected struct {