milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1880 from thornbill/fix-ios-version-detection

Browse source 
Fix iPad detection
This commit is contained in:
dkanada 2020-09-01 15:29:28 +09:00 • committed by GitHub
commit ed1f30c939
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/scripts/browser.js
View file

@ -75,10 +75,24 @@ function hasKeyboard(browser) {
function iOSversion() {
// MacIntel: Apple iPad Pro 11 iOS 13.1
if (/iP(hone|od|ad)|MacIntel/.test(navigator.platform)) {
// supports iOS 2.0 and later: <http://bit.ly/TJjs1V>
const v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/);
return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || 0, 10)];
const tests = [
// Original test for getting full iOS version number in iOS 2.0+
/OS (\d+)_(\d+)_?(\d+)?/,
// Test for iPads running iOS 13+ that can only get the major OS version
/Version\/(\d+)/
];
for (const test of tests) {
const matches = (navigator.appVersion).match(test);
if (matches) {
return [
parseInt(matches[1], 10),
parseInt(matches[2] || 0, 10),
parseInt(matches[3] || 0, 10)
];
}
}
}
return [];
}
let _supportsCssAnimation;
@ -196,6 +210,15 @@ if (!browser.chrome && !browser.edgeChromium && !browser.edge && !browser.opera
browser.safari = true;
}
browser.osx = userAgent.toLowerCase().indexOf('os x') !== -1;
// This is a workaround to detect iPads on iOS 13+ that report as desktop Safari
// This may break in the future if Apple releases a touchscreen Mac
// https://forums.developer.apple.com/thread/119186
if (browser.osx && !browser.iphone && !browser.ipod && !browser.ipad && navigator.maxTouchPoints > 1) {
browser.ipad = true;
}
if (userAgent.toLowerCase().indexOf('playstation 4') !== -1) {
browser.ps4 = true;
browser.tv = true;
@ -242,7 +265,6 @@ if (typeof document !== 'undefined') {
browser.keyboard = hasKeyboard(browser);
browser.supportsCssAnimation = supportsCssAnimation;
browser.osx = userAgent.toLowerCase().indexOf('os x') !== -1;
browser.iOS = browser.ipad || browser.iphone || browser.ipod;
if (browser.iOS) {