From efd706d1d3f35d81a3572aef7259b2a84a77839c Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Wed, 3 Mar 2021 16:05:11 +0000 Subject: [PATCH] Streamline JXA. --- internal/zenutil/osa_generated.go | 4 ++-- internal/zenutil/osascripts/file.gojs | 2 +- internal/zenutil/osascripts/msg.gojs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/zenutil/osa_generated.go b/internal/zenutil/osa_generated.go index 9fcd139..2c7dc4d 100644 --- a/internal/zenutil/osa_generated.go +++ b/internal/zenutil/osa_generated.go @@ -21,14 +21,14 @@ var res=app.chooseColor({defaultColor:{{json .}}}) var app=Application.currentApplication() app.includeStandardAdditions=true app.activate() -var res=app[{{json .Operation}}]({{json .Options}}) +var res=app.{{.Operation}}({{json .Options}}) if(Array.isArray(res)){res.join({{json .Separator}})}else{res.toString()} {{- end}} {{define "msg" -}} var app=Application.currentApplication() app.includeStandardAdditions=true app.activate() -var res=app[{{json .Operation}}]({{json .Text}},{{json .Options}}) +var res=app.{{.Operation}}({{json .Text}},{{json .Options}}) if(res.gaveUp){ObjC.import("stdlib") $.exit(5)} if(res.buttonReturned==={{json .Extra}}){res.buttonReturned}else{void 0} diff --git a/internal/zenutil/osascripts/file.gojs b/internal/zenutil/osascripts/file.gojs index 8d32db0..1229803 100644 --- a/internal/zenutil/osascripts/file.gojs +++ b/internal/zenutil/osascripts/file.gojs @@ -2,7 +2,7 @@ var app = Application.currentApplication() app.includeStandardAdditions = true app.activate() -var res = app[{{json .Operation}}]({{json .Options}}) +var res = app.{{.Operation}}({{json .Options}}) if (Array.isArray(res)) { res.join({{json .Separator}}) } else { diff --git a/internal/zenutil/osascripts/msg.gojs b/internal/zenutil/osascripts/msg.gojs index 6fbbc7d..428c554 100644 --- a/internal/zenutil/osascripts/msg.gojs +++ b/internal/zenutil/osascripts/msg.gojs @@ -2,7 +2,7 @@ var app = Application.currentApplication() app.includeStandardAdditions = true app.activate() -var res = app[{{json .Operation}}]({{json .Text}}, {{json .Options}}) +var res = app.{{.Operation}}({{json .Text}}, {{json .Options}}) if (res.gaveUp) { ObjC.import("stdlib") $.exit(5)