Canceling macos dialogs.
This commit is contained in:
parent
0967af949a
commit
fdfb8a0f20
1 changed files with 15 additions and 4 deletions
|
@ -42,6 +42,9 @@ func OpenFiles(title, defaultPath string, filters []FileFilter) ([]string, error
|
|||
if len(out) > 0 {
|
||||
out = out[:len(out)-1]
|
||||
}
|
||||
if len(out) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
return strings.Split(string(out), "\x00"), nil
|
||||
}
|
||||
|
||||
|
@ -112,6 +115,7 @@ func scriptExpand(data scriptData) io.Reader {
|
|||
var script = template.Must(template.New("").Parse(`<script>
|
||||
var app = Application.currentApplication();
|
||||
app.includeStandardAdditions = true;
|
||||
app.activate();
|
||||
|
||||
var opts = {};
|
||||
opts.withPrompt = {{.Title}};
|
||||
|
@ -124,10 +128,17 @@ opts.multipleSelectionsAllowed = {{.Multiple}};
|
|||
opts.ofType = {{.Filter}};
|
||||
{{end}}
|
||||
|
||||
var ret = app[{{.Operation}}](opts);
|
||||
var ret;
|
||||
try {
|
||||
ret = app[{{.Operation}}](opts);
|
||||
} catch (e) {
|
||||
if (e.errorNumber !== -128) throw e;
|
||||
}
|
||||
if (Array.isArray(ret)) {
|
||||
ret.join('\0');
|
||||
} else {
|
||||
} else if (ret != null) {
|
||||
ret.toString();
|
||||
} else {
|
||||
void 0;
|
||||
}
|
||||
</script>`))
|
||||
|
|
Loading…
Reference in a new issue