A platform for community discussion. Free, open, simple.
FIX: Safari detection logic (#45386)
David Taylor6eea2417549e
diff --git a/frontend/discourse/app/controllers/login.js b/frontend/discourse/app/controllers/login.jsindex 865e5b3bb3d..5bd74e20c2f 100644--- a/frontend/discourse/app/controllers/login.js+++ b/frontend/discourse/app/controllers/login.js@@ -315,14 +315,7 @@ export default class LoginPageController extends Controller {set("redirect", window.location.href);}- if (this.capabilities.isIOS && this.capabilities.isSafari) {- // In case of Safari on iOS do not submit hidden login form- window.location.href = _form.querySelector(- "input[name=redirect]"- ).value;- } else {- _form.submit();- }+ _form.submit();}}} catch (e) {diff --git a/frontend/discourse/app/services/capabilities.js b/frontend/discourse/app/services/capabilities.jsindex e1f2292d39b..0809488de77 100644--- a/frontend/discourse/app/services/capabilities.js+++ b/frontend/discourse/app/services/capabilities.js@@ -72,15 +72,8 @@ class _Capabilities {isOpera = !!window.opera || ua.includes(" OPR/");isFirefox = ua.includes("Firefox");isChrome = !!window.chrome && !this.isOpera;- // In iframes, Safari-specific objects aren't accessible, so fall back to UA detectionisSafari =- window.self !== window.top- ? ua.includes("Safari") &&- !ua.includes("Chrome") &&- !ua.includes("Chromium")- : /Constructor/.test(window.HTMLElement) ||- window.safari?.pushNotification?.toString() ===- "[object SafariRemoteNotification]";+ ua.includes("Safari") && !ua.includes("Chrome") && !ua.includes("Chromium");hasContactPicker = "contacts" in navigator && "ContactsManager" in window;