dany/antosdk-apps
1
0
Fork 0
mirror of https://github.com/antos-rde/antosdk-apps.git synced 2024-12-26 04:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
mrsang 2021-03-31 23:12:04 +02:00
commit 38bde537e7
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ShowCase/build/debug/main.js
View File

File diff suppressed because one or more lines are too long

4
ShowCase/build/debug/package.json
View File

@ -8,7 +8,11 @@
"licences": "GPLv3" "licences": "GPLv3"
}, },
"version":"0.0.7-a", "version":"0.0.7-a",
<<<<<<< HEAD
"category":"Utility", "category":"Utility",
=======
"category":"Other",
>>>>>>> c3df98de9effd1c129b9e5b36420bda12ea4cdba
"mimes":["none"], "mimes":["none"],
"iconclass": "fa fa-delicious", "iconclass": "fa fa-delicious",
"locales": { "locales": {

BIN
ShowCase/build/release/ShowCase.zip
View File

Binary file not shown.

15
ShowCase/coffees/main.coffee
View File

@ -140,7 +140,8 @@ class ShowCase extends this.OS.application.BaseApplication
{ text: "About dialog", id: "about" }, { text: "About dialog", id: "about" },
{ text: "File dialog", id: "file" }, { text: "File dialog", id: "file" },
{ text: "Text dialog", id: "text" }, { text: "Text dialog", id: "text" },
{ text: "Multi-input dialog", id: "minputs" } { text: "Multi-input dialog", id: "minputs" },
{ text: "Multi key value dialog", id: "mkv" }
] ]
btrun.onbtclick = (e) => btrun.onbtclick = (e) =>
@ -228,6 +229,18 @@ class ShowCase extends this.OS.application.BaseApplication
}) })
.then (d) => .then (d) =>
@notify JSON.stringify(d) @notify JSON.stringify(d)
when "mkv"
@openDialog("KeyValueDialog", {
title: "Multi key-values",
data: {
name: "John Doe",
email: "jd@mail.com",
where: "Anywhere on Earth"
}
})
.then (d) =>
@notify JSON.stringify(d)
else return else return

4
ShowCase/package.json
View File

@ -8,7 +8,11 @@
"licences": "GPLv3" "licences": "GPLv3"
}, },
"version":"0.0.7-a", "version":"0.0.7-a",
<<<<<<< HEAD
"category":"Utility", "category":"Utility",
=======
"category":"Other",
>>>>>>> c3df98de9effd1c129b9e5b36420bda12ea4cdba
"mimes":["none"], "mimes":["none"],
"iconclass": "fa fa-delicious", "iconclass": "fa fa-delicious",
"locales": { "locales": {