demo/extension: Expand iPad check to work for iPadOS 13+

Justin-CB · Nov 15, 2023 · ffdb248 · ffdb248
1 parent b196c8d
commit ffdb248
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/web/packages/demo/www/index.js b/web/packages/demo/www/index.js
@@ -230,7 +230,9 @@ reloadSwf.addEventListener("click", () => {
 window.addEventListener("load", () => {
     if (
         navigator.userAgent.match(/iPad/i) ||
-        navigator.userAgent.match(/iPhone/i)
+        navigator.userAgent.match(/iPhone/i) ||
+        (navigator.platform === "MacIntel" &&
+            typeof navigator.standalone !== "undefined")
     ) {
         localFileInput.removeAttribute("accept");
     }

diff --git a/web/packages/extension/src/player.ts b/web/packages/extension/src/player.ts
@@ -7,6 +7,16 @@ import type {
     URLLoadOptions,
 } from "ruffle-core";
 
+declare global {
+    interface Navigator {
+        /**
+         * iPadOS sends a User-Agent string that appears to be from macOS.
+         * navigator.standalone is not defined on macOS, so we use it for iPad detection.
+         */
+        standalone?: boolean;
+    }
+}
+
 const api = PublicAPI.negotiate(window.RufflePlayer!, "local");
 window.RufflePlayer = api;
 const ruffle = api.newest()!;
@@ -216,7 +226,9 @@ reloadSwf.addEventListener("click", () => {
 window.addEventListener("load", () => {
     if (
         navigator.userAgent.match(/iPad/i) ||
-        navigator.userAgent.match(/iPhone/i)
+        navigator.userAgent.match(/iPhone/i) ||
+        (navigator.platform === "MacIntel" &&
+            typeof navigator.standalone !== "undefined")
     ) {
         localFileInput.removeAttribute("accept");
     }