remove isMobile from instance

This commit is contained in:
Harvey committed 2021-12-13 08:45:45 +08:00
1 parent 6b19316bf3
commit 7d06600d7b
10 files changed
+23 -102

No files matched your search

+8 -33
View File
@@ -802,16 +802,16 @@
var kindOf = art.constructor.kindOf,
whitelist = art.option.whitelist;
this.state = !art.isMobile || whitelist.some(function (item) {
this.state = !isMobile || whitelist.some(function (item) {
switch (kindOf(item)) {
case 'string':
return item === '*' || art.userAgent.indexOf(item) > -1;
return item === '*' || userAgent.indexOf(item) > -1;
case 'function':
return item(art.userAgent);
return item(userAgent);
case 'regexp':
return item.test(art.userAgent);
return item.test(userAgent);
default:
return false;
@@ -901,7 +901,7 @@
addClass(this.$info, 'art-backdrop-filter');
}
if (this.art.isMobile) {
if (isMobile) {
addClass(this.$container, 'art-mobile');
}
}
@@ -1225,7 +1225,7 @@
art.once('video:loadedmetadata', function () {
player.autoSize = option.autoSize;
if (art.isMobile) {
if (isMobile) {
art.loading.show = false;
art.controls.show = true;
art.mask.show = true;
@@ -2910,7 +2910,7 @@
tooltip($volume, i18n.get('Mute'));
setStyle($volumeClose, 'display', 'none');
if (art.isMobile) {
if (isMobile) {
setStyle($volumePanel, 'display', 'none');
}
@@ -3789,7 +3789,7 @@
}
function gestureInit(art, events) {
if (art.isMobile && !art.option.isLive) {
if (isMobile && !art.option.isLive) {
var player = art.player,
notice = art.notice,
$video = art.template.$video;
@@ -4807,31 +4807,6 @@
}
_createClass(Artplayer, [{
key: "userAgent",
get: function get() {
return userAgent;
}
}, {
key: "isMobile",
get: function get() {
return isMobile;
}
}, {
key: "isWechat",
get: function get() {
return isWechat;
}
}, {
key: "isSafari",
get: function get() {
return isSafari;
}
}, {
key: "isIE",
get: function get() {
return isIE;
}
}, {
key: "proxy",
get: function get() {
return this.events.proxy;
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMin.js","../../packages/artplayer/src/player/rotateMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.jLine truncated
{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMin.js","../../packages/artplayer/src/player/rotateMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.jLine truncated
@@ -34,24 +34,6 @@ Whether the player instance has been focused
Whether the player instance is destroyed
## userAgent
- Type: `Boolean`
Equal to `window.navigator.userAgent`
## isMobile
- Type: `Boolean`
Current environment mobile device
## isWechat
- Type: `Boolean`
Whether the current environment is WeChat equipment
## whitelist
- Type: `Object`
@@ -34,24 +34,6 @@ slug: /zh-cn/advance
播放器实例是否被销毁
## userAgent
- 类型: `Boolean`
等于 `window.navigator.userAgent`
## isMobile
- 类型: `Boolean`
当前环境是否移动设备
## isWechat
- 类型: `Boolean`
当前环境是否微信设备
## whitelist
- 类型: `Object`
+2 -2
View File
@@ -1,4 +1,4 @@
import { append, clamp, tooltip, setStyle } from '../utils';
import { append, clamp, tooltip, setStyle, isMobile } from '../utils';
export default function volume(option) {
return (art) => ({
@@ -21,7 +21,7 @@ export default function volume(option) {
tooltip($volume, i18n.get('Mute'));
setStyle($volumeClose, 'display', 'none');
if (art.isMobile) {
if (isMobile) {
setStyle($volumePanel, 'display', 'none');
}
+2 -2
View File
@@ -1,7 +1,7 @@
import { clamp, secondToTime } from '../utils';
import { clamp, secondToTime, isMobile } from '../utils';
export default function gestureInit(art, events) {
if (art.isMobile && !art.option.isLive) {
if (isMobile && !art.option.isLive) {
const {
player,
notice,
-20
View File
@@ -173,26 +173,6 @@ export default class Artplayer extends Emitter {
};
}
get userAgent() {
return utils.userAgent;
}
get isMobile() {
return utils.isMobile;
}
get isWechat() {
return utils.isWechat;
}
get isSafari() {
return utils.isSafari;
}
get isIE() {
return utils.isIE;
}
get proxy() {
return this.events.proxy;
}
+2 -2
View File
@@ -1,5 +1,5 @@
import config from '../config';
import { sleep, addClass, setStyle } from '../utils';
import { sleep, addClass, setStyle, isMobile } from '../utils';
export default function eventInit(art, player) {
const {
@@ -96,7 +96,7 @@ export default function eventInit(art, player) {
art.once('video:loadedmetadata', () => {
player.autoSize = option.autoSize;
if (art.isMobile) {
if (isMobile) {
art.loading.show = false;
art.controls.show = true;
art.mask.show = true;
+2 -2
View File
@@ -1,4 +1,4 @@
import { errorHandle, query, addClass, replaceElement } from './utils';
import { errorHandle, query, addClass, replaceElement, isMobile } from './utils';
export default class Template {
constructor(art) {
@@ -144,7 +144,7 @@ export default class Template {
addClass(this.$info, 'art-backdrop-filter');
}
if (this.art.isMobile) {
if (isMobile) {
addClass(this.$container, 'art-mobile');
}
}
+6 -4
View File
@@ -1,3 +1,5 @@
import { userAgent, isMobile } from './utils';
export default class Whitelist {
constructor(art) {
const {
@@ -5,15 +7,15 @@ export default class Whitelist {
option: { whitelist },
} = art;
this.state =
!art.isMobile ||
!isMobile ||
whitelist.some((item) => {
switch (kindOf(item)) {
case 'string':
return item === '*' || art.userAgent.indexOf(item) > -1;
return item === '*' || userAgent.indexOf(item) > -1;
case 'function':
return item(art.userAgent);
return item(userAgent);
case 'regexp':
return item.test(art.userAgent);
return item.test(userAgent);
default:
return false;
}