Verified Commit 42e9acf4 authored by FabioWidmer's avatar FabioWidmer
Browse files

Update to v1.0.2

parent 316bc7b2
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.ablota.store" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="com.ablota.store" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Ablota Store</name> <name>Ablota Store</name>
<description>The universal, decentralized and open source app store.</description> <description>The universal, decentralized and open source app store.</description>
<author email="info@ablota.com" href="https://ablota.com">Ablota (StarApps GmbH)</author> <author email="info@ablota.com" href="https://ablota.com">Ablota (StarApps GmbH)</author>
......
{ {
"name": "com.ablota.store", "name": "com.ablota.store",
"displayName": "Ablota Store", "displayName": "Ablota Store",
"version": "1.0.1", "version": "1.0.2",
"cordova": { "cordova": {
"plugins": { "plugins": {
"cordova-plugin-statusbar": {}, "cordova-plugin-statusbar": {},
...@@ -45,4 +45,4 @@ ...@@ -45,4 +45,4 @@
"cordova-plugin-x-socialsharing": "^6.0.2", "cordova-plugin-x-socialsharing": "^6.0.2",
"es6-promise-plugin": "^4.2.2" "es6-promise-plugin": "^4.2.2"
} }
} }
\ No newline at end of file
This diff is collapsed.
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
f7params: { f7params: {
id: 'com.ablota.store', id: 'com.ablota.store',
name: 'Ablota Store', name: 'Ablota Store',
version: '1.0.1', version: '1.0.2',
theme: 'auto', theme: 'auto',
data: function() { data: function() {
return { return {
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
<% for (var index in htmlWebpackPlugin.files.css) { %> <% for (var index in htmlWebpackPlugin.files.css) { %>
<link as="style" href="<%= htmlWebpackPlugin.files.css[index] %>" rel="preload"> <link as="style" href="<%= htmlWebpackPlugin.files.css[index] %>" rel="preload">
<% } %> <% for (var index in htmlWebpackPlugin.files.js) { %> <% } %>
<% for (var index in htmlWebpackPlugin.files.js) { %>
<link as="script" href="<%= htmlWebpackPlugin.files.js[index] %>" rel="preload"> <link as="script" href="<%= htmlWebpackPlugin.files.js[index] %>" rel="preload">
<% } %> <% } %>
......
...@@ -500,7 +500,7 @@ export function suggestPackage(app, packages, deviceInfo) { ...@@ -500,7 +500,7 @@ export function suggestPackage(app, packages, deviceInfo) {
} }
} }
if(!suggestion) { if(!suggestion) {
if(allPackages[0].versionName === compatiblePackages[0].versionName) { if(compatiblePackages.length && allPackages[0].versionName === compatiblePackages[0].versionName) {
suggestion = compatiblePackages[0]; suggestion = compatiblePackages[0];
} else { } else {
suggestion = allPackages[0]; suggestion = allPackages[0];
......
...@@ -414,6 +414,7 @@ export default { ...@@ -414,6 +414,7 @@ export default {
return; return;
} }
this.$$('.fab-uninstall').hide();
this.installPackageCancelled = false; this.installPackageCancelled = false;
const fakeProgress = setInterval(() => update({ const fakeProgress = setInterval(() => update({
...@@ -471,17 +472,20 @@ export default { ...@@ -471,17 +472,20 @@ export default {
}, },
}); });
this.$f7.fab.close('.fab-install'); this.$f7.fab.close('.fab-install');
this.$$('.fab-uninstall').show();
} else if(data.status === 'failure' || (data.status === 'success' && data.code !== 0)) { } else if(data.status === 'failure' || (data.status === 'success' && data.code !== 0)) {
this.$f7.toast.show({ this.$f7.toast.show({
text: this.$t('pages.app.install.failure'), text: this.$t('pages.app.install.failure'),
}); });
this.$f7.fab.close('.fab-install'); this.$f7.fab.close('.fab-install');
this.$$('.fab-uninstall').show();
} }
this.checkPackages(); this.checkPackages();
}, data => { }, data => {
this.$f7.dialog.alert(this.$t(data)); this.$f7.dialog.alert(this.$t(data));
this.$f7.fab.close('.fab-install'); this.$f7.fab.close('.fab-install');
this.$$('.fab-uninstall').show();
}); });
}).catch(data => { }).catch(data => {
this.$f7.dialog.alert(this.$t(data)); this.$f7.dialog.alert(this.$t(data));
...@@ -495,7 +499,10 @@ export default { ...@@ -495,7 +499,10 @@ export default {
cancelInstallPackage: function() { cancelInstallPackage: function() {
this.installPackageCancelled = true; this.installPackageCancelled = true;
setTimeout(() => this.$f7.fab.close('.fab-install'), 1000); setTimeout(() => {
this.$f7.fab.close('.fab-install');
this.$$('.fab-uninstall').show();
}, 1000);
}, },
launchApp: function() { launchApp: function() {
if(!Device.cordova) return; if(!Device.cordova) return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment