Merge branch 'master' of https://github.com/zhw2590582/ArtPlayer

packages/artplayer/dist/artplayer.js

@@ -1,7 +1,7 @@
 /*!
- * artplayer.js v4.5.3
+ * artplayer.js v4.5.4
  * Github: https://github.com/zhw2590582/ArtPlayer
  * (c) 2017-2022 Harvey Zack
  * Released under the MIT License.
  */
-!function(e,t,r,o,i){var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:{},a="function"==typeof n.parcelRequireb749&&n.parcelRequireb749,s=a.cache||{},l="undefined"!=typeof module&&"function"==typeof module.require&&module.require.bind(module);function c(t,r){if(!s[t]){if(!e[t]){var o="function"==typeof n.parcelRequireb749&&n.parcelRequireb749;if(!r&&o)return o(t,!0);if(a)return a(t,!0);if(l&&"string"==typeof t)return l(t);var i=new Error("Cannot find module '"+t+"'");throw i.code="MODULE_NOT_FOUND",i}u.resolve=function(r){var o=e[t][1][r];return null!=o?o:r},u.cache={};var p=s[t]=new c.Module(t);e[t][0].call(p.exports,u,p,p.exports,this)}return s[t].exports;function u(e){var t=u.resolve(e);return!1===t?{}:c(t)}}c.isParcelRequire=!0,c.Module=function(e){this.id=e,this.bundle=c,this.exports={}},c.modules=e,c.cache=s,c.parent=a,c.register=function(t,r){e[t]=[function(e,t){t.exports=r},{}]},Object.defineProperty(c,"root",{get:function(){return n.parcelRequireb749}}),n.parcelRequireb749=c;for(var p=0;p<t.length;p++)c(t[p]);var u=c(r);"object"==typeof exports&&"undefined"!=typeof module?module.exports=u:"function"==typeof define&&define.amd&&define((function(){return u}))}({E13ST:[function(e,t,r){var o=e("@parcel/transformer-js/src/esmodule-helpers.js");o.defineInteropFlag(r);var i=e("bundle-text:./style/index.less"),n=o.interopDefault(i),a=e("option-validator"),s=o.interopDefault(a),l=e("./utils/emitter"),c=o.interopDefault(l),p=e("./utils"),u=e("./scheme"),d=o.interopDefault(u),f=e("./config"),h=o.interopDefault(f),m=e("./whitelist"),g=o.interopDefault(m),v=e("./template"),y=o.interopDefault(v),b=e("./i18n"),x=o.interopDefault(b),w=e("./player"),j=o.interopDefault(w),k=e("./control"),S=o.interopDefault(k),I=e("./contextmenu"),C=o.interopDefault(I),$=e("./info"),F=o.interopDefault($),M=e("./subtitle"),T=o.interopDefault(M),E=e("./events"),P=o.interopDefault(E),z=e("./hotkey"),D=o.interopDefault(z),A=e("./layer"),R=o.interopDefault(A),O=e("./loading"),L=o.interopDefault(O),H=e("./notice"),N=o.interopDefault(H),Y=e("./mask"),V=o.interopDefault(Y),_=e("./icons"),q=o.interopDefault(_),W=e("./setting"),B=o.interopDefault(W),U=e("./storage"),Z=o.interopDefault(U),X=e("./plugins"),G=o.interopDefault(X),Q=e("./mobile"),J=o.interopDefault(Q);let K=0;const ee=[];class te extends c.default{constructor(e,t){super(),this.id=++K;const r=p.mergeDeep(te.option,e);this.option=(0,s.default)(r,d.default),this.isLock=!1,this.isReady=!1,this.isFocus=!1,this.isInput=!1,this.isDestroy=!1,this.whitelist=new(0,g.default)(this),this.template=new(0,y.default)(this),this.events=new(0,P.default)(this),this.whitelist.state?(this.storage=new(0,Z.default)(this),this.icons=new(0,q.default)(this),this.i18n=new(0,x.default)(this),this.notice=new(0,N.default)(this),this.player=new(0,j.default)(this),this.layers=new(0,R.default)(this),this.controls=new(0,S.default)(this),this.contextmenu=new(0,C.default)(this),this.subtitle=new(0,T.default)(this),this.info=new(0,F.default)(this),this.loading=new(0,L.default)(this),this.hotkey=new(0,D.default)(this),this.mask=new(0,V.default)(this),this.setting=new(0,B.default)(this),this.plugins=new(0,G.default)(this)):this.mobile=new(0,J.default)(this),"function"==typeof t&&this.on("ready",(()=>t.call(this))),ee.push(this)}static get instances(){return ee}static get version(){return"4.5.3"}static get env(){return"production"}static get build(){return"1657700130200"}static get config(){return h.default}static get utils(){return p}static get scheme(){return d.default}static get Emitter(){return c.default}static get validator(){return s.default}static get kindOf(){return s.default.kindOf}static get html(){return y.default.html}static get option(){return{container:"#artplayer",url:"",poster:"",title:"",type:"",theme:"#f00",volume:.7,isLive:!1,muted:!1,autoplay:!1,autoSize:!1,autoMini:!1,loop:!1,flip:!1,playbackRate:!1,aspectRatio:!1,screenshot:!1,setting:!1,hotkey:!0,pip:!1,mutex:!0,backdrop:!0,fullscreen:!1,fullscreenWeb:!1,subtitleOffset:!1,miniProgressBar:!1,useSSR:!1,playsInline:!0,lock:!1,fastForward:!1,autoPlayback:!1,autoOrientation:!1,airplay:!1,layers:[],contextmenu:[],controls:[],settings:[],quality:[],highlight:[],plugins:[],whitelist:[],thumbnails:{url:"",number:60,column:10},subtitle:{url:"",type:"",style:{},encoding:"utf-8"},moreVideoAttr:{controls:!1,preload:p.isSafari?"auto":"metadata"},icons:{},customType:{},lang:navigator.language.toLowerCase()}}get proxy(){return this.events.proxy}get query(){return this.template.query}destroy(e=!0){this.events.destroy(),this.template.destroy(e),ee.splice(ee.indexOf(this),1),this.isDestroy=!0,this.emit("destroy")}}if(r.default=te,te.NOTICE_TIME=2e3,te.SETTING_WIDTH=250,te.SETTING_ITEM_WIDTH=200,te.SETTING_ITEM_HEIGHT=35,te.INDICATOR_SIZE=14,te.INDICATOR_SIZE_ICON=16,te.INDICATOR_SIZE_MOBILE=18,te.INDICATOR_SIZE_MOBILE_ICON=20,te.VOLUME_PANEL_WIDTH=60,te.VOLUME_HANDLE_WIDLine truncated
+!function(e,t,r,o,n){var i="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:{},a="function"==typeof i.parcelRequireb749&&i.parcelRequireb749,s=a.cache||{},l="undefined"!=typeof module&&"function"==typeof module.require&&module.require.bind(module);function c(t,r){if(!s[t]){if(!e[t]){var o="function"==typeof i.parcelRequireb749&&i.parcelRequireb749;if(!r&&o)return o(t,!0);if(a)return a(t,!0);if(l&&"string"==typeof t)return l(t);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}u.resolve=function(r){var o=e[t][1][r];return null!=o?o:r},u.cache={};var p=s[t]=new c.Module(t);e[t][0].call(p.exports,u,p,p.exports,this)}return s[t].exports;function u(e){var t=u.resolve(e);return!1===t?{}:c(t)}}c.isParcelRequire=!0,c.Module=function(e){this.id=e,this.bundle=c,this.exports={}},c.modules=e,c.cache=s,c.parent=a,c.register=function(t,r){e[t]=[function(e,t){t.exports=r},{}]},Object.defineProperty(c,"root",{get:function(){return i.parcelRequireb749}}),i.parcelRequireb749=c;for(var p=0;p<t.length;p++)c(t[p]);var u=c(r);"object"==typeof exports&&"undefined"!=typeof module?module.exports=u:"function"==typeof define&&define.amd&&define((function(){return u}))}({E13ST:[function(e,t,r){var o=e("@parcel/transformer-js/src/esmodule-helpers.js");o.defineInteropFlag(r);var n=e("bundle-text:./style/index.less"),i=o.interopDefault(n),a=e("option-validator"),s=o.interopDefault(a),l=e("./utils/emitter"),c=o.interopDefault(l),p=e("./utils"),u=e("./scheme"),d=o.interopDefault(u),f=e("./config"),h=o.interopDefault(f),m=e("./whitelist"),g=o.interopDefault(m),v=e("./template"),y=o.interopDefault(v),b=e("./i18n"),x=o.interopDefault(b),w=e("./player"),j=o.interopDefault(w),k=e("./control"),S=o.interopDefault(k),I=e("./contextmenu"),C=o.interopDefault(I),$=e("./info"),F=o.interopDefault($),M=e("./subtitle"),T=o.interopDefault(M),E=e("./events"),P=o.interopDefault(E),z=e("./hotkey"),D=o.interopDefault(z),A=e("./layer"),R=o.interopDefault(A),O=e("./loading"),L=o.interopDefault(O),H=e("./notice"),N=o.interopDefault(H),Y=e("./mask"),V=o.interopDefault(Y),_=e("./icons"),q=o.interopDefault(_),W=e("./setting"),B=o.interopDefault(W),U=e("./storage"),Z=o.interopDefault(U),X=e("./plugins"),G=o.interopDefault(X),Q=e("./mobile"),J=o.interopDefault(Q);let K=0;const ee=[];class te extends c.default{constructor(e,t){super(),this.id=++K;const r=p.mergeDeep(te.option,e);this.option=(0,s.default)(r,d.default),this.isLock=!1,this.isReady=!1,this.isFocus=!1,this.isInput=!1,this.isDestroy=!1,this.whitelist=new(0,g.default)(this),this.template=new(0,y.default)(this),this.events=new(0,P.default)(this),this.whitelist.state?(this.storage=new(0,Z.default)(this),this.icons=new(0,q.default)(this),this.i18n=new(0,x.default)(this),this.notice=new(0,N.default)(this),this.player=new(0,j.default)(this),this.layers=new(0,R.default)(this),this.controls=new(0,S.default)(this),this.contextmenu=new(0,C.default)(this),this.subtitle=new(0,T.default)(this),this.info=new(0,F.default)(this),this.loading=new(0,L.default)(this),this.hotkey=new(0,D.default)(this),this.mask=new(0,V.default)(this),this.setting=new(0,B.default)(this),this.plugins=new(0,G.default)(this)):this.mobile=new(0,J.default)(this),"function"==typeof t&&this.on("ready",(()=>t.call(this))),ee.push(this)}static get instances(){return ee}static get version(){return"4.5.4"}static get env(){return"production"}static get build(){return"1658107367811"}static get config(){return h.default}static get utils(){return p}static get scheme(){return d.default}static get Emitter(){return c.default}static get validator(){return s.default}static get kindOf(){return s.default.kindOf}static get html(){return y.default.html}static get option(){return{container:"#artplayer",url:"",poster:"",title:"",type:"",theme:"#f00",volume:.7,isLive:!1,muted:!1,autoplay:!1,autoSize:!1,autoMini:!1,loop:!1,flip:!1,playbackRate:!1,aspectRatio:!1,screenshot:!1,setting:!1,hotkey:!0,pip:!1,mutex:!0,backdrop:!0,fullscreen:!1,fullscreenWeb:!1,subtitleOffset:!1,miniProgressBar:!1,useSSR:!1,playsInline:!0,lock:!1,fastForward:!1,autoPlayback:!1,autoOrientation:!1,airplay:!1,layers:[],contextmenu:[],controls:[],settings:[],quality:[],highlight:[],plugins:[],whitelist:[],thumbnails:{url:"",number:60,column:10},subtitle:{url:"",type:"",style:{},encoding:"utf-8"},moreVideoAttr:{controls:!1,preload:p.isSafari?"auto":"metadata"},icons:{},customType:{},lang:navigator.language.toLowerCase()}}get proxy(){return this.events.proxy}get query(){return this.template.query}destroy(e=!0){this.events.destroy(),this.template.destroy(e),ee.splice(ee.indexOf(this),1),this.isDestroy=!0,this.emit("destroy")}}if(r.default=te,te.NOTICE_TIME=2e3,te.SETTING_WIDTH=250,te.SETTING_ITEM_WIDTH=200,te.SETTING_ITEM_HEIGHT=35,te.INDICATOR_SIZE=14,te.INDICATOR_SIZE_ICON=16,te.INDICATOR_SIZE_MOBILE=18,te.INDICATOR_SIZE_MOBILE_ICON=20,te.VOLUME_PANEL_WIDTH=60,te.VOLUME_HANDLE_WIDLine truncated

packages/artplayer/package.json

@@ -1,7 +1,7 @@
 {
     "license": "MIT",
     "name": "artplayer",
-    "version": "4.5.3",
+    "version": "4.5.4",
     "main": "dist/artplayer.js",
     "types": "types/artplayer.d.ts",
     "homepage": "https://artplayer.org",

packages/artplayer/src/libs/screenfull.js

@@ -0,0 +1,153 @@
+const methodMap = [
+    [
+        'requestFullscreen',
+        'exitFullscreen',
+        'fullscreenElement',
+        'fullscreenEnabled',
+        'fullscreenchange',
+        'fullscreenerror',
+    ],
+    // New WebKit
+    [
+        'webkitRequestFullscreen',
+        'webkitExitFullscreen',
+        'webkitFullscreenElement',
+        'webkitFullscreenEnabled',
+        'webkitfullscreenchange',
+        'webkitfullscreenerror',
+    ],
+    // Old WebKit
+    [
+        'webkitRequestFullScreen',
+        'webkitCancelFullScreen',
+        'webkitCurrentFullScreenElement',
+        'webkitCancelFullScreen',
+        'webkitfullscreenchange',
+        'webkitfullscreenerror',
+    ],
+    [
+        'mozRequestFullScreen',
+        'mozCancelFullScreen',
+        'mozFullScreenElement',
+        'mozFullScreenEnabled',
+        'mozfullscreenchange',
+        'mozfullscreenerror',
+    ],
+    [
+        'msRequestFullscreen',
+        'msExitFullscreen',
+        'msFullscreenElement',
+        'msFullscreenEnabled',
+        'MSFullscreenChange',
+        'MSFullscreenError',
+    ],
+];
+
+const nativeAPI = (() => {
+    if (typeof document === 'undefined') {
+        return false;
+    }
+
+    const unprefixedMethods = methodMap[0];
+    const returnValue = {};
+
+    for (const methodList of methodMap) {
+        const exitFullscreenMethod = methodList[1];
+        if (exitFullscreenMethod in document) {
+            for (const [index, method] of methodList.entries()) {
+                returnValue[unprefixedMethods[index]] = method;
+            }
+
+            return returnValue;
+        }
+    }
+
+    return false;
+})();
+
+const eventNameMap = {
+    change: nativeAPI.fullscreenchange,
+    error: nativeAPI.fullscreenerror,
+};
+
+let screenfull = {
+    request(element = document.documentElement, options) {
+        return new Promise((resolve, reject) => {
+            const onFullScreenEntered = () => {
+                screenfull.off('change', onFullScreenEntered);
+                resolve();
+            };
+
+            screenfull.on('change', onFullScreenEntered);
+
+            const returnPromise = element[nativeAPI.requestFullscreen](options);
+
+            if (returnPromise instanceof Promise) {
+                returnPromise.then(onFullScreenEntered).catch(reject);
+            }
+        });
+    },
+    exit() {
+        return new Promise((resolve, reject) => {
+            if (!screenfull.isFullscreen) {
+                resolve();
+                return;
+            }
+
+            const onFullScreenExit = () => {
+                screenfull.off('change', onFullScreenExit);
+                resolve();
+            };
+
+            screenfull.on('change', onFullScreenExit);
+
+            const returnPromise = document[nativeAPI.exitFullscreen]();
+
+            if (returnPromise instanceof Promise) {
+                returnPromise.then(onFullScreenExit).catch(reject);
+            }
+        });
+    },
+    toggle(element, options) {
+        return screenfull.isFullscreen ? screenfull.exit() : screenfull.request(element, options);
+    },
+    onchange(callback) {
+        screenfull.on('change', callback);
+    },
+    onerror(callback) {
+        screenfull.on('error', callback);
+    },
+    on(event, callback) {
+        const eventName = eventNameMap[event];
+        if (eventName) {
+            document.addEventListener(eventName, callback, false);
+        }
+    },
+    off(event, callback) {
+        const eventName = eventNameMap[event];
+        if (eventName) {
+            document.removeEventListener(eventName, callback, false);
+        }
+    },
+    raw: nativeAPI,
+};
+
+Object.defineProperties(screenfull, {
+    isFullscreen: {
+        get: () => Boolean(document[nativeAPI.fullscreenElement]),
+    },
+    element: {
+        enumerable: true,
+        get: () => document[nativeAPI.fullscreenElement],
+    },
+    isEnabled: {
+        enumerable: true,
+        get: () => Boolean(document[nativeAPI.fullscreenEnabled]),
+    },
+});
+
+if (!nativeAPI) {
+    screenfull = { isEnabled: false };
+}
+
+export default screenfull;

packages/artplayer/src/player/fullscreenMix.js

@@ -1,4 +1,4 @@
-import screenfull from 'screenfull';
+import screenfull from '../libs/screenfull';
 import { addClass, removeClass, def, get } from '../utils';
 
 export default function fullscreenMix(art) {