From 9f32113f6bad8160e328020ed6c0cbf06add29fa Mon Sep 17 00:00:00 2001 From: James Date: Wed, 19 Sep 2018 11:23:44 +1000 Subject: [PATCH] Clean up updating text --- static/js/views.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/static/js/views.js b/static/js/views.js index 4323fd0..c86a31d 100644 --- a/static/js/views.js +++ b/static/js/views.js @@ -166,7 +166,7 @@ const SelectPackages = { const InstallPackages = { template: `
-

Checking for updates...

+

Checking for updates...

Uninstalling...

Downloading self-update...

Installing...

@@ -185,12 +185,14 @@ const InstallPackages = { progress_message: "Please wait...", is_uninstall: false, is_updater_update: false, + is_update: false, failed_with_error: false } }, created: function() { this.is_uninstall = this.$route.params.kind === "uninstall"; this.is_updater_update = this.$route.params.kind === "updater"; + this.is_update = this.$route.params.kind === "update"; console.log("Installer kind: " + this.$route.params.kind); this.install(); }, @@ -248,9 +250,9 @@ const InstallPackages = { app.exit(); } else if (!that.failed_with_error) { if (that.is_uninstall) { - router.replace({name: 'complete', params: {uninstall: true}}); + router.replace({name: 'complete', params: {uninstall: true, update: that.is_update}}); } else { - router.replace({name: 'complete', params: {uninstall: false}}); + router.replace({name: 'complete', params: {uninstall: false, update: that.is_update}}); } } } @@ -285,7 +287,12 @@ const ErrorView = { const CompleteView = { template: `
-
+
+

{{ $root.$data.attrs.name }} has been updated.

+ +

You can find your installed applications in your start menu.

+
+

Thanks for installing {{ $root.$data.attrs.name }}!

You can find your installed applications in your start menu.

@@ -299,7 +306,8 @@ const CompleteView = { `, data: function() { return { - was_install: !this.$route.params.uninstall + was_install: !this.$route.params.uninstall, + was_update: this.$route.params.update } }, methods: { @@ -353,7 +361,7 @@ const ModifyView = { }, methods: { update: function() { - router.push("/install/regular"); + router.push("/install/update"); }, modify_packages: function() { router.push("/packages"); @@ -393,7 +401,7 @@ const router = new VueRouter({ component: ErrorView }, { - path: '/complete/:uninstall', + path: '/complete/:uninstall/:update', name: 'complete', component: CompleteView },