From b2cc8d95311816dc97fc5648301b56430dc1b0c0 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Fri, 15 Nov 2019 21:13:26 +0200
Subject: [PATCH] Fix web app install button

---
 client/components/Windows/Settings.vue   | 28 +++++++++++++++++++++---
 client/js/socket-events/configuration.js | 15 -------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/client/components/Windows/Settings.vue b/client/components/Windows/Settings.vue
index 08f921fd..eb7dd2e9 100644
--- a/client/components/Windows/Settings.vue
+++ b/client/components/Windows/Settings.vue
@@ -20,13 +20,18 @@
 			</div>
 
 			<div class="row">
-				<div v-if="canRegisterProtocol" id="native-app" class="col-sm-12">
+				<div v-if="canRegisterProtocol || hasInstallPromptEvent" class="col-sm-12">
 					<h2>Native app</h2>
-					<button id="webapp-install-button" type="button" class="btn" hidden>
+					<button
+						v-if="hasInstallPromptEvent"
+						type="button"
+						class="btn"
+						@click.prevent="nativeInstallPrompt"
+					>
 						Add The Lounge to Home screen
 					</button>
 					<button
-						id="make-default-client"
+						v-if="canRegisterProtocol"
 						type="button"
 						class="btn"
 						@click.prevent="registerProtocol"
@@ -455,6 +460,13 @@ import RevealPassword from "../RevealPassword.vue";
 import Session from "../Session.vue";
 import SidebarToggle from "../SidebarToggle.vue";
 
+let installPromptEvent = null;
+
+window.addEventListener("beforeinstallprompt", (e) => {
+	e.preventDefault();
+	installPromptEvent = e;
+});
+
 export default {
 	name: "Settings",
 	components: {
@@ -475,6 +487,12 @@ export default {
 			},
 		};
 	},
+	computed: {
+		hasInstallPromptEvent() {
+			// TODO: This doesn't hide the button after clicking
+			return installPromptEvent !== null;
+		},
+	},
 	mounted() {
 		socket.emit("sessions:get");
 
@@ -542,6 +560,10 @@ export default {
 			window.navigator.registerProtocolHandler("irc", uri, "The Lounge");
 			window.navigator.registerProtocolHandler("ircs", uri, "The Lounge");
 		},
+		nativeInstallPrompt() {
+			installPromptEvent.prompt();
+			installPromptEvent = null;
+		},
 		playNotification() {
 			const pop = new Audio();
 			pop.src = "audio/pop.wav";
diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.js
index 51000477..a41fca8e 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.js
@@ -1,25 +1,10 @@
 "use strict";
 
-const $ = require("jquery");
 const socket = require("../socket");
 const upload = require("../upload");
 const store = require("../store").default;
 const router = require("../router");
 
-window.addEventListener("beforeinstallprompt", (installPromptEvent) => {
-	$("#webapp-install-button")
-		.on("click", function() {
-			if (installPromptEvent && installPromptEvent.prompt) {
-				installPromptEvent.prompt();
-			}
-
-			$(this).prop("hidden", true);
-		})
-		.prop("hidden", false);
-
-	$("#native-app").prop("hidden", false);
-});
-
 socket.once("configuration", function(data) {
 	store.commit("serverConfiguration", data);