diff --git a/src/BrowserInfo.js b/src/BrowserInfo.js index 7742ae17d..2e6b28029 100644 --- a/src/BrowserInfo.js +++ b/src/BrowserInfo.js @@ -1,17 +1,10 @@ function userAgent(pattern) { - return !!navigator.userAgent.match(pattern); + return !!/*@__PURE__*/navigator.userAgent.match(pattern); } -const IE11OrLess = /*@__PURE__*/userAgent(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i); -const Edge = /*@__PURE__*/userAgent(/Edge/i); -const FireFox = /*@__PURE__*/userAgent(/firefox/i); -const Safari = /*@__PURE__*/userAgent(/safari/i) && !userAgent(/chrome/i) && !userAgent(/android/i); -const IOS = /*@__PURE__*/userAgent(/iP(ad|od|hone)/i); - -export { - IE11OrLess, - Edge, - FireFox, - Safari, - IOS -}; +export const IE11OrLess = userAgent(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i); +export const Edge = userAgent(/Edge/i); +export const FireFox = userAgent(/firefox/i); +export const Safari = userAgent(/safari/i) && !userAgent(/chrome/i) && !userAgent(/android/i); +export const IOS = userAgent(/iP(ad|od|hone)/i); +export const ChromeForAndroid = userAgent(/chrome/i) && userAgent(/android/i); diff --git a/src/Sortable.js b/src/Sortable.js index 723350b53..ce3ab207f 100644 --- a/src/Sortable.js +++ b/src/Sortable.js @@ -7,7 +7,7 @@ import { version } from '../package.json'; -import { IE11OrLess, Edge, FireFox, Safari, IOS } from './BrowserInfo.js'; +import { IE11OrLess, Edge, FireFox, Safari, IOS, ChromeForAndroid } from './BrowserInfo.js'; import AnimationStateManager from './Animation.js'; @@ -143,7 +143,7 @@ let dragEl, CSSFloatProperty = Edge || IE11OrLess ? 'cssFloat' : 'float', // This will not pass for IE9, because IE9 DnD only works on anchors - supportDraggable = ('draggable' in document.createElement('div')), + supportDraggable = !ChromeForAndroid && ('draggable' in document.createElement('div')), supportCssPointerEvents = (function() { // false when <= IE11