From 8a224bf99937d82e81fec2fb0b17adb428ee026e Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Thu, 16 Feb 2023 18:00:37 -0300 Subject: [PATCH] FEATURE: Use feature detection for showing push notification in iOS (#20338) * FEATURE: Use feature detection for showing push notification in iOS * Don't want this on DiscourseHub as it's confusing --- app/assets/javascripts/discourse/app/lib/push-notifications.js | 3 +-- .../discourse/app/templates/preferences/notifications.hbs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/push-notifications.js b/app/assets/javascripts/discourse/app/lib/push-notifications.js index e89cba54c4..1659f924c5 100644 --- a/app/assets/javascripts/discourse/app/lib/push-notifications.js +++ b/app/assets/javascripts/discourse/app/lib/push-notifications.js @@ -48,8 +48,7 @@ export function isPushNotificationsSupported() { "PushManager" in window && !caps.isAppWebview && navigator.serviceWorker.controller && - navigator.serviceWorker.controller.state === "activated" && - !caps.isIOS + navigator.serviceWorker.controller.state === "activated" ) ) { return false; diff --git a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs index 0dcaa75c17..dd53f23151 100644 --- a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs +++ b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs @@ -23,7 +23,7 @@ -{{#unless this.capabilities.isIOS}} +{{#unless this.capabilities.isAppWebview}}