ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Openvidu browser now identifies iPad Pro as a supported device

pull/531/head
Richard Gustavsson 2020-09-03 22:10:35 +02:00
parent 7b2c9f9118
commit d1ecd92796
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openvidu-browser/src/OpenVidu/OpenVidu.ts
View File

@ -43,7 +43,11 @@ import RpcBuilder = require('../OpenViduInternal/KurentoUtils/kurento-jsonrpc');
*/ */
import platform = require('platform'); import platform = require('platform');
platform['isIonicIos'] = (platform.product === 'iPhone' || platform.product === 'iPad') && platform.ua!!.indexOf('Safari') === -1; const isTouchable = 'ontouchend' in document;
const isIPad = platform.product === 'iPad' || (/\b(\w*Macintosh\w*)\b/.test(platform.ua!!) && isTouchable);
const isIPhone = /\b(\w*iPhone\w*)\b/.test(platform.ua!!) && /\b(\w*Mobile\w*)\b/.test(platform.ua!!) && isTouchable;
platform['isIonicIos'] = (platform.product === 'iPhone' || isIPad) && platform.ua!!.indexOf('Safari') === -1;
platform['isIonicAndroid'] = platform.os!!.family === 'Android' && platform.name == "Android Browser"; platform['isIonicAndroid'] = platform.os!!.family === 'Android' && platform.name == "Android Browser";
/** /**
@ -337,7 +341,7 @@ export class OpenVidu {
const family = platform.os!!.family; const family = platform.os!!.family;
const userAgent = !!platform.ua ? platform.ua : navigator.userAgent; const userAgent = !!platform.ua ? platform.ua : navigator.userAgent;
if(this.isIPhoneOrIPad(userAgent)) { if (isIPhone || isIPhone) {
if(this.isIOSWithSafari(userAgent) || platform['isIonicIos']){ if(this.isIOSWithSafari(userAgent) || platform['isIonicIos']){
return 1; return 1;
} }
@ -1056,18 +1060,8 @@ export class OpenVidu {
(platform.name === 'Electron' && videoSource.startsWith('screen:')) (platform.name === 'Electron' && videoSource.startsWith('screen:'))
} }
private isIPhoneOrIPad(userAgent): boolean {
const isTouchable = 'ontouchend' in document;
const isIPad = /\b(\w*Macintosh\w*)\b/.test(userAgent) && isTouchable;
const isIPhone = /\b(\w*iPhone\w*)\b/.test(userAgent) && /\b(\w*Mobile\w*)\b/.test(userAgent) && isTouchable;
return isIPad || isIPhone;
}
private isIOSWithSafari(userAgent): boolean{ private isIOSWithSafari(userAgent): boolean{
return /\b(\w*Apple\w*)\b/.test(navigator.vendor) && /\b(\w*Safari\w*)\b/.test(userAgent) return /\b(\w*Apple\w*)\b/.test(navigator.vendor) && /\b(\w*Safari\w*)\b/.test(userAgent)
&& !/\b(\w*CriOS\w*)\b/.test(userAgent) && !/\b(\w*FxiOS\w*)\b/.test(userAgent); && !/\b(\w*CriOS\w*)\b/.test(userAgent) && !/\b(\w*FxiOS\w*)\b/.test(userAgent);
} }
} }