diff --git a/common/browser.js b/common/browser.js index 1c6623bef2..5e03de77ca 100644 --- a/common/browser.js +++ b/common/browser.js @@ -43,7 +43,7 @@ var AscBrowser = { isMacOs : false, isSafariMacOs : false, isAppleDevices : false, - isAndroid : false, + isAndroid : false, isMobile : false, isGecko : false, isChrome : false, @@ -60,7 +60,8 @@ var AscBrowser = { isSailfish : false, isEmulateDevicePixelRatio : false, isNeedEmulateUpload : false, - chromeVersion : 70 + chromeVersion : 70, + iosVersion : 13 }; // user agent lower case @@ -99,6 +100,24 @@ AscBrowser.isAppleDevices = (AscBrowser.userAgent.indexOf("ipad") > -1 || AscBrowser.userAgent.indexOf("iphone") > -1 || AscBrowser.userAgent.indexOf("ipod") > -1); +if (AscBrowser.isAppleDevices) +{ + var iosversion = AscBrowser.iosVersion; + try + { + if (/iP(hone|od|ad)/.test(navigator.platform)) + { + var v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/); + //[parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || 0, 10)]; + iosversion = parseInt(v[1], 10); + } + } + catch (err) + { + } + AscBrowser.iosVersion = iosversion; +} + // android devices detect AscBrowser.isAndroid = (AscBrowser.userAgent.indexOf("android") > -1); diff --git a/vendor/iscroll.js b/vendor/iscroll.js index 61e899770f..4dd1d239fe 100644 --- a/vendor/iscroll.js +++ b/vendor/iscroll.js @@ -81,13 +81,15 @@ var utils = (function () { }; var _transform = _prefixStyle('transform'); + var _hasPointer = AscCommon.AscBrowser.isIE ? ((!('ontouchstart' in window)) && (!!(window.PointerEvent || window.MSPointerEvent))) : false; + if (AscCommon.AscBrowser.isAppleDevices && AscCommon.AscBrowser.iosVersion >= 13) + _hasPointer = true; me.extend(me, { hasTransform: _transform !== false, hasPerspective: _prefixStyle('perspective') in _elementStyle, hasTouch: 'ontouchstart' in window, - //hasPointer: false,//(!('ontouchstart' in window)) && (!!(window.PointerEvent || window.MSPointerEvent)), // IE10 is prefixed - hasPointer: AscCommon.AscBrowser.isIE ? ((!('ontouchstart' in window)) && (!!(window.PointerEvent || window.MSPointerEvent))) : false, + hasPointer: _hasPointer, hasTransition: _prefixStyle('transition') in _elementStyle });