格式化

.eslintrc

@@ -10,6 +10,8 @@
       "jQuery": false
   },
   "rules": {
+      "class-methods-use-this": 0,
+      "no-console": 0,
       "import/no-cycle": 1,
       "no-const-assign": 1,
       "no-shadow": 0,

docs/lab/css/artplayer.css

@@ -1,15 +1,15 @@
 .artplayer-video-player .artplayer-video{position:absolute;z-index:10;left:0;top:0;right:0;bottom:0;width:100%;height:100%;background-color:#000;outline:0;cursor:pointer}
-.artplayer-video-player .artplayer-layers{position:absolute;z-index:30;left:0;top:0;right:0;bottom:0;width:100%;height:100%;pointer-events:none}.artplayer-video-player .artplayer-layers .art-layer{pointer-events:all}
 .artplayer-video-player{position:relative;width:100%;height:100%;overflow:hidden;outline:0;font-family:Roboto,Arial,Helvetica,sans-serif;color:#eee;text-align:left;direction:ltr;font-size:14px;line-height:1.3;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:rgba(0,0,0,0);touch-action:manipulation;-ms-high-contrast-adjust:none}.artplayer-video-player *{box-sizing:border-box}.artplayer-video-player .art-icon{display:inline-block;line-height:1.5}.artplayer-video-player .art-icon svg{fill:#fff}
 .artplayer-video-player .artplayer-subtitle{position:absolute;z-index:20;bottom:40px;width:100%;padding:0 20px;text-align:center;color:#fff;text-shadow:.5px .5px .5px rgba(0,0,0,.5);font-size:20px;pointer-events:none}.artplayer-video-player .artplayer-subtitle p{margin:5px 0}
+.artplayer-video-player .artplayer-layers{position:absolute;z-index:30;left:0;top:0;right:0;bottom:0;width:100%;height:100%;pointer-events:none}.artplayer-video-player .artplayer-layers .art-layer{pointer-events:all}
 .artplayer-video-player .artplayer-mask{display:none;position:absolute;z-index:40;left:0;top:0;right:0;bottom:0;width:100%;height:100%;pointer-events:none}.artplayer-video-player .artplayer-mask .art-icon-playBig{position:absolute;right:30px;bottom:65px;opacity:.6}
 .artplayer-video-player .artplayer-loading{display:none;position:absolute;z-index:60;left:0;top:0;right:0;bottom:0;width:100%;height:100%;align-items:center;justify-content:center;pointer-events:none}
 .artplayer-video-player .artplayer-bottom{position:absolute;z-index:50;left:0;right:0;bottom:0;height:100px;padding:60px 10px 0;opacity:0;visibility:hidden;transition:all .2s ease-in-out;pointer-events:none;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAADGCAYAAAAT+OqFAAAAdklEQVQoz42QQQ7AIAgEF/T/D+kbq/RWAlnQyyazA4aoAB4FsBSA/bFjuF1EOL7VbrIrBuusmrt4ZZORfb6ehbWdnRHEIiITaEUKa5EJqUakRSaEYBJSCY2dEstQY7AuxahwXFrvZmWl2rh4JZ07z9dLtesfNj5q0FU3A5ObbwAAAABJRU5ErkJggg==) repeat-x bottom}.artplayer-video-player .artplayer-bottom .artplayer-progress{position:relative;pointer-events:all}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress{position:relative;height:5px;padding:1px 0;cursor:pointer}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner{position:relative;height:100%;background:hsla(0,0%,100%,.2)}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-loaded{position:absolute;z-index:10;left:0;top:0;right:0;bottom:0;height:100%;width:0;background:hsla(0,0%,100%,.4)}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-played{position:absolute;z-index:20;left:0;top:0;right:0;bottom:0;height:100%;width:0}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-highlight{position:absolute;z-index:30;left:0;top:0;right:0;bottom:0;height:0}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-highlight span{display:inline-block;position:absolute;left:0;top:0;width:7px;height:3px;background:#fff;border-radius:3px}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-indicator{display:none;position:absolute;z-index:40;top:-5px;left:-6.5px;width:13px;height:13px;border-radius:50%}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-indicator.art-show-indicator{display:block}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress .art-control-progress-inner .art-progress-tip{display:none;position:absolute;z-index:50;top:-25px;left:0;height:20px;padding:0 5px;line-height:20px;color:#fff;font-size:12px;text-align:center;background:rgba(0,0,0,.7);border-radius:3px;font-weight:700}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress:hover .art-progress-indicator,.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-progress:hover .art-progress-tip{display:block}.artplayer-video-player .artplayer-bottom .artplayer-progress .art-control-thumbnails{display:none;position:absolute;bottom:8px;left:0;pointer-events:none;background-color:rgba(0,0,0,.7)}.artplayer-video-player .artplayer-bottom .artplayer-controls{position:relative;pointer-events:all;display:flex;align-items:center;justify-content:space-between;height:36px}.artplayer-video-player .artplayer-bottom .artplayer-controls .artplayer-controls-left,.artplayer-video-player .artplayer-bottom .artplayer-controls .artplayer-controls-right{display:flex}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control{opacity:.9;font-size:12px;height:36px;line-height:36px;cursor:pointer}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control .art-icon{display:flex;align-items:center;justify-content:center;float:left;height:36px;width:36px}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control:hover{opacity:1}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume .art-volume-panel{position:relative;float:left;width:0;height:100%;transition:margin .2s cubic-bezier(.4,0,1,1),width .2s cubic-bezier(.4,0,1,1);overflow:hidden}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume .art-volume-panel .art-volume-slider-handle{position:absolute;top:50%;left:0;width:12px;height:12px;border-radius:12px;margin-top:-6px;background:#fff}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume .art-volume-panel .art-volume-slider-handle:before{left:-54px;background:#fff}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume .art-volume-panel .art-volume-slider-handle:after{left:6px;background:hsla(0,0%,100%,.2)}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume .art-volume-panel .art-volume-slider-handle:after,.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume .art-volume-panel .art-volume-slider-handle:before{content:"";position:absolute;display:block;top:50%;height:3px;margin-top:-2px;width:60px}.artplayer-video-player .artplayer-bottom .artplayer-controls .art-control-volume Line truncated
 .artplayer-video-player .artplayer-notice{display:none;font-size:14px;position:absolute;z-index:70;left:0;top:0;padding:10px;width:100%;pointer-events:none}.artplayer-video-player .artplayer-notice .artplayer-notice-inner{display:inline-block;padding:5px 10px;color:#fff;background:rgba(0,0,0,.6);border-radius:3px}
 .artplayer-video-player .artplayer-contextmenu{display:none;position:absolute;z-index:110;left:0;top:0;min-width:200px;padding:5px 0;background:rgba(0,0,0,.8);border-radius:3px}.artplayer-video-player .artplayer-contextmenu .art-contextmenu{cursor:pointer;font-size:13px;display:block;color:#fff;padding:7px 10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-shadow:0 0 2px rgba(0,0,0,.5);border-bottom:1px solid hsla(0,0%,100%,.1)}.artplayer-video-player .artplayer-contextmenu .art-contextmenu a{color:#fff;text-decoration:none}.artplayer-video-player .artplayer-contextmenu .art-contextmenu span{display:inline-block;padding:0 7px}.artplayer-video-player .artplayer-contextmenu .art-contextmenu span.current,.artplayer-video-player .artplayer-contextmenu .art-contextmenu span:hover{color:#00c9ff}.artplayer-video-player .artplayer-contextmenu .art-contextmenu:hover{background-color:hsla(0,0%,100%,.1)}.artplayer-video-player .artplayer-contextmenu .art-contextmenu:last-child{border-bottom:none}
+.artplayer-video-player .artplayer-setting{display:none;position:absolute;z-index:80;left:0;top:0;height:100%;width:100%;align-items:center;justify-content:center;pointer-events:none}.artplayer-video-player .artplayer-setting .artplayer-setting-inner{position:relative;width:300px;height:250px;font-size:12px;background:rgba(0,0,0,.8);border-radius:3px;pointer-events:all;overflow:hidden}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body{overflow-y:auto;width:100%;height:100%}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body .art-setting{border-bottom:1px solid hsla(0,0%,100%,.1);padding:12px 20px}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body .art-setting .art-setting-header{color:#fff;margin-bottom:10px}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body .art-setting .art-setting-body{color:hsla(0,0%,100%,.8)}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-close{position:absolute;top:0;right:0;width:20px;height:20px;line-height:20px;text-align:center;color:hsla(0,0%,100%,.8);background:rgba(0,0,0,.5);font-size:20px;cursor:pointer}.artplayer-video-player .artplayer-setting .art-setting-btns{display:flex;margin-left:-4px;margin-right:-4px}.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn{flex:1;padding:0 4px}.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn span{display:block;height:20px;line-height:20px;text-align:center;color:#fff;background:hsla(0,0%,100%,.3);border-radius:2px;cursor:pointer}.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn.current span,.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn:hover span{color:#fff;background:#00a1d6}
 .artplayer-video-player.artplayer-hide-cursor *{cursor:none!important}
 .artplayer-video-player .artplayer-info{display:none;position:absolute;left:10px;top:10px;z-index:90;width:350px;min-height:150px;padding:10px;color:#fff;font-size:12px;font-family:Noto Sans CJK SC DemiLight,Roboto,Segoe UI,Tahoma,Arial,Helvetica,sans-serif;-webkit-font-smoothing:antialiased;background:rgba(0,0,0,.7)}.artplayer-video-player .artplayer-info .art-info-item{display:flex;margin-bottom:5px}.artplayer-video-player .artplayer-info .art-info-item .art-info-title{width:100px;text-align:right}.artplayer-video-player .artplayer-info .art-info-item .art-info-content{flex:1;padding-left:5px}.artplayer-video-player .artplayer-info .artplayer-info-close{position:absolute;top:5px;right:5px;cursor:pointer}
-.artplayer-video-player .artplayer-setting{display:none;position:absolute;z-index:80;left:0;top:0;height:100%;width:100%;align-items:center;justify-content:center;pointer-events:none}.artplayer-video-player .artplayer-setting .artplayer-setting-inner{position:relative;width:300px;height:250px;font-size:12px;background:rgba(0,0,0,.8);border-radius:3px;pointer-events:all;overflow:hidden}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body{overflow-y:auto;width:100%;height:100%}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body .art-setting{border-bottom:1px solid hsla(0,0%,100%,.1);padding:12px 20px}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body .art-setting .art-setting-header{color:#fff;margin-bottom:10px}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-body .art-setting .art-setting-body{color:hsla(0,0%,100%,.8)}.artplayer-video-player .artplayer-setting .artplayer-setting-inner .artplayer-setting-close{position:absolute;top:0;right:0;width:20px;height:20px;line-height:20px;text-align:center;color:hsla(0,0%,100%,.8);background:rgba(0,0,0,.5);font-size:20px;cursor:pointer}.artplayer-video-player .artplayer-setting .art-setting-btns{display:flex;margin-left:-4px;margin-right:-4px}.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn{flex:1;padding:0 4px}.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn span{display:block;height:20px;line-height:20px;text-align:center;color:#fff;background:hsla(0,0%,100%,.3);border-radius:2px;cursor:pointer}.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn.current span,.artplayer-video-player .artplayer-setting .art-setting-btns .art-setting-btn:hover span{color:#fff;background:#00a1d6}
 .artplayer-video-player[data-aspect-ratio] video{box-sizing:content-box;-o-object-fit:fill;object-fit:fill}
 .artplayer-video-player.artplayer-web-fullscreen{position:fixed;z-index:9999;width:100%;height:100%;left:0;top:0;right:0;bottom:0}
 .artplayer-video-player .artplayer-pip-header{display:none;position:absolute;z-index:100;left:0;top:0;right:0;height:35px;line-height:35px;color:#fff;background:rgba(0,0,0,.5);align-items:center;justify-content:space-between;opacity:0;visibility:hidden;transition:all .2s ease-in-out}.artplayer-video-player .artplayer-pip-header .artplayer-pip-title{flex:1;padding:0 10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:move}.artplayer-video-player .artplayer-pip-header .artplayer-pip-close{width:35px;text-align:center;font-size:22px;cursor:pointer}.artplayer-video-player.is-dragging{opacity:.7}.artplayer-video-player.artplayer-pip{position:fixed;z-index:9999;right:20px;bottom:20px;width:400px;height:225px;box-shadow:0 2px 5px 0 rgba(0,0,0,.16),0 3px 6px 0 rgba(0,0,0,.2)}.artplayer-video-player.artplayer-pip .artplayer-pip-header{display:flex}.artplayer-video-player.artplayer-pip.artplayer-hover .artplayer-pip-header{opacity:1;visibility:visible}.artplayer-video-player.artplayer-pip .artplayer-mask{align-items:center;justify-content:center}.artplayer-video-player.artplayer-pip .artplayer-mask .art-icon-playBig{position:static}.artplayer-video-player.artplayer-pip .artplayer-bottom,.artplayer-video-player.artplayer-pip .artplayer-contextmenu,.artplayer-video-player.artplayer-pip .artplayer-danmu,.artplayer-video-player.artplayer-pip .artplayer-info,.artplayer-video-player.artplayer-pip .artplayer-layers,.artplayer-video-player.artplayer-pip .artplayer-notice,.artplayer-video-player.artplayer-pip .artplayer-setting,.artplayer-video-player.artplayer-pip .artplayer-subtitle{display:none!important}

docs/lab/js/artplayer.js

@@ -4,6 +4,36 @@
   (factory((global.artplayer = {})));
 }(this, (function (exports) { 'use strict';
 
+  function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) {
+      for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) {
+        arr2[i] = arr[i];
+      }
+
+      return arr2;
+    }
+  }
+
+  var arrayWithoutHoles = _arrayWithoutHoles;
+
+  function _iterableToArray(iter) {
+    if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
+  }
+
+  var iterableToArray = _iterableToArray;
+
+  function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance");
+  }
+
+  var nonIterableSpread = _nonIterableSpread;
+
+  function _toConsumableArray(arr) {
+    return arrayWithoutHoles(arr) || iterableToArray(arr) || nonIterableSpread();
+  }
+
+  var toConsumableArray = _toConsumableArray;
+
   function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
       throw new TypeError("Cannot call a class as a function");
@@ -121,73 +151,163 @@
 
   var inherits = _inherits;
 
-  function _defineProperty(obj, key, value) {
+  function E () {
-    if (key in obj) {
+    // Keep this empty so it's easier to inherit from
-      Object.defineProperty(obj, key, {
+    // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-
-    return obj;
   }
 
-  var defineProperty = _defineProperty;
+  E.prototype = {
+    on: function (name, callback, ctx) {
+      var e = this.e || (this.e = {});
 
-  function _objectSpread(target) {
+      (e[name] || (e[name] = [])).push({
-    for (var i = 1; i < arguments.length; i++) {
+        fn: callback,
-      var source = arguments[i] != null ? arguments[i] : {};
+        ctx: ctx
-      var ownKeys = Object.keys(source);
+      });
 
-      if (typeof Object.getOwnPropertySymbols === 'function') {
+      return this;
-        ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
+    },
-          return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+
-        }));
+    once: function (name, callback, ctx) {
+      var self = this;
+      function listener () {
+        self.off(name, listener);
+        callback.apply(ctx, arguments);
+      }
+      listener._ = callback;
+      return this.on(name, listener, ctx);
+    },
+
+    emit: function (name) {
+      var data = [].slice.call(arguments, 1);
+      var evtArr = ((this.e || (this.e = {}))[name] || []).slice();
+      var i = 0;
+      var len = evtArr.length;
+
+      for (i; i < len; i++) {
+        evtArr[i].fn.apply(evtArr[i].ctx, data);
       }
 
-      ownKeys.forEach(function (key) {
+      return this;
-        defineProperty(target, key, source[key]);
+    },
-      });
-    }
 
-    return target;
+    off: function (name, callback) {
-  }
+      var e = this.e || (this.e = {});
+      var evts = e[name];
+      var liveEvents = [];
 
-  var objectSpread = _objectSpread;
+      if (evts && callback) {
-
+        for (var i = 0, len = evts.length; i < len; i++) {
-  function _arrayWithoutHoles(arr) {
+          if (evts[i].fn !== callback && evts[i].fn._ !== callback)
-    if (Array.isArray(arr)) {
+            liveEvents.push(evts[i]);
-      for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) {
+        }
-        arr2[i] = arr[i];
       }
 
-      return arr2;
+      // Remove event from queue to prevent memory leak
+      // Suggested by https://github.com/lazd
+      // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910
+
+      (liveEvents.length)
+        ? e[name] = liveEvents
+        : delete e[name];
+
+      return this;
     }
+  };
+
+  var tinyEmitter = E;
+
+  var optionValidator = createCommonjsModule(function (module, exports) {
+  !function(r,t){module.exports=t();}(commonjsGlobal,function(){function c(r){return (c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r})(r)}var u=Object.prototype.toString,i=function(r){if(void 0===r)return "undefined";if(null===r)return "null";var t,e,n,o,a,i=c(r);if("boolean"===i)return "boolean";if("string"===i)return "string";if("number"===i)return "number";if("symbol"===i)return "symbol";if("function"===i)return "GeneratorFunction"===f(r)?"generatorfunction":"function";if(t=r,Array.isArray?Array.isArray(t):t instanceof Array)return "array";if(function(r){if(r.constructor&&"function"==typeof r.constructor.isBuffer)return r.constructor.isBuffer(r);return !1}(r))return "buffer";if(function(r){try{if("number"==typeof r.length&&"function"==typeof r.callee)return !0}catch(r){if(-1!==r.message.indexOf("callee"))return !0}return !1}(r))return "arguments";if((e=r)instanceof Date||"function"==typeof e.toDateString&&"function"==typeof e.getDate&&"function"==typeof e.setDate)return "date";if((n=r)instanceof Error||"string"==typeof n.message&&n.constructor&&"number"==typeof n.constructor.stackTraceLimit)return "error";if((o=r)instanceof RegExp||"string"==typeof o.flags&&"boolean"==typeof o.ignoreCase&&"boolean"==typeof o.multiline&&"boolean"==typeof o.global)return "regexp";switch(f(r)){case"Symbol":return "symbol";case"Promise":return "promise";case"WeakMap":return "weakmap";case"WeakSet":return "weakset";case"Map":return "map";case"Set":return "set";case"Int8Array":return "int8array";case"Uint8Array":return "uint8array";case"Uint8ClampedArray":return "uint8clampedarray";case"Int16Array":return "int16array";case"Uint16Array":return "uint16array";case"Int32Array":return "int32array";case"Uint32Array":return "uint32array";case"Float32Array":return "float32array";case"Float64Array":return "float64array"}if("function"==typeof(a=r).throw&&"function"==typeof a.return&&"function"==typeof a.next)return "generator";switch(i=u.call(r)){case"[object Object]":return "object";case"[object Map Iterator]":return "mapiterator";case"[object Set Iterator]":return "setiterator";case"[object String Iterator]":return "stringiterator";case"[object Array Iterator]":return "arrayiterator"}return i.slice(8,-1).toLowerCase().replace(/\s/g,"")};function f(r){return r.constructor?r.constructor.name:null}function a(r,t){var e=2<arguments.length&&void 0!==arguments[2]?arguments[2]:["option"];for(var n in y(r,t,e),l(r,t,e),p(r,t,e),t)if(t.hasOwnProperty(n)){var o=r[n],a=t[n],i=e.concat(n);if(s(r,n,a,i))continue;y(o,a,i),l(o,a,i),p(o,a,i);}}function s(r,t,e,n){if(!Object.prototype.hasOwnProperty.call(r,t)){if(!0===e.__required__||!0===e.required)throw new TypeError("'".concat(n.join("."),"' is required"));return !0}}function y(r,t,e){var n;if("string"===i(t)?n=t:"function"===i(t)?t.___validator__=t:t.__type__?n=t.__type__:t.type&&(n=t.type),n&&"string"===i(n)){n=n.trim().toLowerCase();var o=i(r),a=o===n;if(-1<n.indexOf("|"))a=n.split("|").filter(Boolean).some(function(r){return o===r.trim()});if(!a)throw new TypeError("'".concat(e.join("."),"' require '").concat(n,"' type, but got '").concat(o,"'"))}}function l(r,t,e){var n;if(t.___validator__?n=t.___validator__:t.validator&&(n=t.validator),"function"===i(n)){var o=n(e,r,i(r));if(!0!==o)throw new TypeError("The scheme for '".concat(e.join("."),"' validator function require return true, but got '").concat(o,"'"))}}function p(r,t,e){var n;if(t.___child__?n=t.___child__:t.child&&(n=t.child),"object"===i(n)){var o=i(r);"object"===o?a(r,n,e):"array"===o&&r.forEach(function(r,t){a(r,n,e.concat(t));});}}return a.kindOf=i,window.optionValidator=a});
+  });
+
+  var isMergeableObject = function isMergeableObject(value) {
+  	return isNonNullObject(value)
+  		&& !isSpecial(value)
+  };
+
+  function isNonNullObject(value) {
+  	return !!value && typeof value === 'object'
   }
 
-  var arrayWithoutHoles = _arrayWithoutHoles;
+  function isSpecial(value) {
+  	var stringValue = Object.prototype.toString.call(value);
 
-  function _iterableToArray(iter) {
+  	return stringValue === '[object RegExp]'
-    if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
+  		|| stringValue === '[object Date]'
+  		|| isReactElement(value)
   }
 
-  var iterableToArray = _iterableToArray;
+  // see https://github.com/facebook/react/blob/b5ac963fb791d1298e7f396236383bc955f916c1/src/isomorphic/classic/element/ReactElement.js#L21-L25
+  var canUseSymbol = typeof Symbol === 'function' && Symbol.for;
+  var REACT_ELEMENT_TYPE = canUseSymbol ? Symbol.for('react.element') : 0xeac7;
 
-  function _nonIterableSpread() {
+  function isReactElement(value) {
-    throw new TypeError("Invalid attempt to spread non-iterable instance");
+  	return value.$$typeof === REACT_ELEMENT_TYPE
   }
 
-  var nonIterableSpread = _nonIterableSpread;
+  function emptyTarget(val) {
-
+  	return Array.isArray(val) ? [] : {}
-  function _toConsumableArray(arr) {
-    return arrayWithoutHoles(arr) || iterableToArray(arr) || nonIterableSpread();
   }
 
-  var toConsumableArray = _toConsumableArray;
+  function cloneUnlessOtherwiseSpecified(value, options) {
+  	return (options.clone !== false && options.isMergeableObject(value))
+  		? deepmerge(emptyTarget(value), value, options)
+  		: value
+  }
+
+  function defaultArrayMerge(target, source, options) {
+  	return target.concat(source).map(function(element) {
+  		return cloneUnlessOtherwiseSpecified(element, options)
+  	})
+  }
+
+  function mergeObject(target, source, options) {
+  	var destination = {};
+  	if (options.isMergeableObject(target)) {
+  		Object.keys(target).forEach(function(key) {
+  			destination[key] = cloneUnlessOtherwiseSpecified(target[key], options);
+  		});
+  	}
+  	Object.keys(source).forEach(function(key) {
+  		if (!options.isMergeableObject(source[key]) || !target[key]) {
+  			destination[key] = cloneUnlessOtherwiseSpecified(source[key], options);
+  		} else {
+  			destination[key] = deepmerge(target[key], source[key], options);
+  		}
+  	});
+  	return destination
+  }
+
+  function deepmerge(target, source, options) {
+  	options = options || {};
+  	options.arrayMerge = options.arrayMerge || defaultArrayMerge;
+  	options.isMergeableObject = options.isMergeableObject || isMergeableObject;
+
+  	var sourceIsArray = Array.isArray(source);
+  	var targetIsArray = Array.isArray(target);
+  	var sourceAndTargetTypesMatch = sourceIsArray === targetIsArray;
+
+  	if (!sourceAndTargetTypesMatch) {
+  		return cloneUnlessOtherwiseSpecified(source, options)
+  	} else if (sourceIsArray) {
+  		return options.arrayMerge(target, source, options)
+  	} else {
+  		return mergeObject(target, source, options)
+  	}
+  }
+
+  deepmerge.all = function deepmergeAll(array, options) {
+  	if (!Array.isArray(array)) {
+  		throw new Error('first argument should be an array')
+  	}
+
+  	return array.reduce(function(prev, next) {
+  		return deepmerge(prev, next, options)
+  	}, {})
+  };
+
+  var deepmerge_1 = deepmerge;
 
   function _isNativeFunction(fn) {
     return Function.toString.call(fn).indexOf("[native code]") !== -1;
@@ -360,47 +480,6 @@
     var sec = Math.floor(second - hour * 3600 - min * 60);
     return (hour > 0 ? [hour, min, sec] : [min, sec]).map(add0).join(':');
   }
-  function deepMerge() {
-    var isObject = function isObject(value) {
-      return value !== null && _typeof_1(value) === 'object';
-    };
-
-    var returnValue = {};
-
-    for (var _len = arguments.length, sources = new Array(_len), _key = 0; _key < _len; _key++) {
-      sources[_key] = arguments[_key];
-    }
-
-    for (var _i = 0; _i < sources.length; _i++) {
-      var source = sources[_i];
-
-      if (Array.isArray(source)) {
-        if (!Array.isArray(returnValue)) {
-          returnValue = [];
-        }
-
-        returnValue = toConsumableArray(returnValue).concat(toConsumableArray(source));
-      } else if (isObject(source)) {
-        if (source instanceof Element) {
-          return source;
-        }
-
-        for (var key in source) {
-          if (source.hasOwnProperty(key)) {
-            var value = source[key];
-
-            if (isObject(value) && key in returnValue) {
-              value = deepMerge(returnValue[key], value);
-            }
-
-            returnValue = objectSpread({}, returnValue, defineProperty({}, key, value));
-          }
-        }
-      }
-    }
-
-    return returnValue;
-  }
   function tooltip(target, msg) {
     var pos = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'up';
     target.setAttribute('data-balloon', msg);
@@ -427,7 +506,9 @@
     var timeout;
 
     function fn() {
-      var args = arguments;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
 
       var later = function later() {
         timeout = null;
@@ -457,7 +538,6 @@
     setStyles: setStyles,
     getStyle: getStyle,
     secondToTime: secondToTime,
-    deepMerge: deepMerge,
     tooltip: tooltip,
     sleep: sleep,
     sublings: sublings,
@@ -465,10 +545,6 @@
     debounce: debounce
   });
 
-  var optionValidator = createCommonjsModule(function (module, exports) {
-  !function(r,t){module.exports=t();}(commonjsGlobal,function(){function c(r){return (c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(r){return typeof r}:function(r){return r&&"function"==typeof Symbol&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r})(r)}var u=Object.prototype.toString,i=function(r){if(void 0===r)return "undefined";if(null===r)return "null";var t,e,n,o,a,i=c(r);if("boolean"===i)return "boolean";if("string"===i)return "string";if("number"===i)return "number";if("symbol"===i)return "symbol";if("function"===i)return "GeneratorFunction"===f(r)?"generatorfunction":"function";if(t=r,Array.isArray?Array.isArray(t):t instanceof Array)return "array";if(function(r){if(r.constructor&&"function"==typeof r.constructor.isBuffer)return r.constructor.isBuffer(r);return !1}(r))return "buffer";if(function(r){try{if("number"==typeof r.length&&"function"==typeof r.callee)return !0}catch(r){if(-1!==r.message.indexOf("callee"))return !0}return !1}(r))return "arguments";if((e=r)instanceof Date||"function"==typeof e.toDateString&&"function"==typeof e.getDate&&"function"==typeof e.setDate)return "date";if((n=r)instanceof Error||"string"==typeof n.message&&n.constructor&&"number"==typeof n.constructor.stackTraceLimit)return "error";if((o=r)instanceof RegExp||"string"==typeof o.flags&&"boolean"==typeof o.ignoreCase&&"boolean"==typeof o.multiline&&"boolean"==typeof o.global)return "regexp";switch(f(r)){case"Symbol":return "symbol";case"Promise":return "promise";case"WeakMap":return "weakmap";case"WeakSet":return "weakset";case"Map":return "map";case"Set":return "set";case"Int8Array":return "int8array";case"Uint8Array":return "uint8array";case"Uint8ClampedArray":return "uint8clampedarray";case"Int16Array":return "int16array";case"Uint16Array":return "uint16array";case"Int32Array":return "int32array";case"Uint32Array":return "uint32array";case"Float32Array":return "float32array";case"Float64Array":return "float64array"}if("function"==typeof(a=r).throw&&"function"==typeof a.return&&"function"==typeof a.next)return "generator";switch(i=u.call(r)){case"[object Object]":return "object";case"[object Map Iterator]":return "mapiterator";case"[object Set Iterator]":return "setiterator";case"[object String Iterator]":return "stringiterator";case"[object Array Iterator]":return "arrayiterator"}return i.slice(8,-1).toLowerCase().replace(/\s/g,"")};function f(r){return r.constructor?r.constructor.name:null}function a(r,t){var e=2<arguments.length&&void 0!==arguments[2]?arguments[2]:["option"];for(var n in y(r,t,e),l(r,t,e),p(r,t,e),t)if(t.hasOwnProperty(n)){var o=r[n],a=t[n],i=e.concat(n);if(s(r,n,a,i))continue;y(o,a,i),l(o,a,i),p(o,a,i);}}function s(r,t,e,n){if(!Object.prototype.hasOwnProperty.call(r,t)){if(!0===e.__required__||!0===e.required)throw new TypeError("'".concat(n.join("."),"' is required"));return !0}}function y(r,t,e){var n;if("string"===i(t)?n=t:"function"===i(t)?t.___validator__=t:t.__type__?n=t.__type__:t.type&&(n=t.type),n&&"string"===i(n)){n=n.trim().toLowerCase();var o=i(r),a=o===n;if(-1<n.indexOf("|"))a=n.split("|").filter(Boolean).some(function(r){return o===r.trim()});if(!a)throw new TypeError("'".concat(e.join("."),"' require '").concat(n,"' type, but got '").concat(o,"'"))}}function l(r,t,e){var n;if(t.___validator__?n=t.___validator__:t.validator&&(n=t.validator),"function"===i(n)){var o=n(e,r,i(r));if(!0!==o)throw new TypeError("The scheme for '".concat(e.join("."),"' validator function require return true, but got '").concat(o,"'"))}}function p(r,t,e){var n;if(t.___child__?n=t.___child__:t.child&&(n=t.child),"object"===i(n)){var o=i(r);"object"===o?a(r,n,e):"array"===o&&r.forEach(function(r,t){a(r,n,e.concat(t));});}}return a.kindOf=i,window.optionValidator=a});
-  });
-
   function validElement(paths, value, type) {
     if (type === 'string') {
       if (value.trim() === '') {
@@ -640,77 +716,11 @@
     video: video
   };
 
-  function E () {
-    // Keep this empty so it's easier to inherit from
-    // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)
-  }
-
-  E.prototype = {
-    on: function (name, callback, ctx) {
-      var e = this.e || (this.e = {});
-
-      (e[name] || (e[name] = [])).push({
-        fn: callback,
-        ctx: ctx
-      });
-
-      return this;
-    },
-
-    once: function (name, callback, ctx) {
-      var self = this;
-      function listener () {
-        self.off(name, listener);
-        callback.apply(ctx, arguments);
-      }
-      listener._ = callback;
-      return this.on(name, listener, ctx);
-    },
-
-    emit: function (name) {
-      var data = [].slice.call(arguments, 1);
-      var evtArr = ((this.e || (this.e = {}))[name] || []).slice();
-      var i = 0;
-      var len = evtArr.length;
-
-      for (i; i < len; i++) {
-        evtArr[i].fn.apply(evtArr[i].ctx, data);
-      }
-
-      return this;
-    },
-
-    off: function (name, callback) {
-      var e = this.e || (this.e = {});
-      var evts = e[name];
-      var liveEvents = [];
-
-      if (evts && callback) {
-        for (var i = 0, len = evts.length; i < len; i++) {
-          if (evts[i].fn !== callback && evts[i].fn._ !== callback)
-            liveEvents.push(evts[i]);
-        }
-      }
-
-      // Remove event from queue to prevent memory leak
-      // Suggested by https://github.com/lazd
-      // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910
-
-      (liveEvents.length)
-        ? e[name] = liveEvents
-        : delete e[name];
-
-      return this;
-    }
-  };
-
-  var tinyEmitter = E;
-
   var Template = function Template(art) {
     classCallCheck(this, Template);
 
     var refs = art.refs;
-    refs.$container.innerHTML = "\n      <div class=\"artplayer-video-player\">\n        <video data-index=\"10\" class=\"artplayer-video\"></video>\n        <div data-index=\"20\" class=\"artplayer-subtitle\"></div>\n        <div data-index=\"30\" class=\"artplayer-layers\"></div>\n        <div data-index=\"40\" class=\"artplayer-mask\"></div>\n        <div data-index=\"50\" class=\"artplayer-bottom\">\n          <div class=\"artplayer-progress\"></div>\n          <div class=\"artplayer-controls\">\n            <div class=\"artplayer-controls-left\"></div>\n            <div class=\"artplayer-controls-right\"></div>\n          </div>\n        </div>\n        <div data-index=\"60\" class=\"artplayer-loading\"></div>\n        <div data-index=\"70\" class=\"artplayer-notice\">\n          <div class=\"artplayer-notice-inner\"></div>\n        </div>\n        <div data-index=\"80\" class=\"artplayer-setting\">\n          <div class=\"artplayer-setting-inner\">\n            <div class=\"artplayer-setting-body\"></div>\n            <div class=\"artplayer-setting-close\">\xD7</div>\n          </div>\n        </div>\n        <div data-index=\"90\" class=\"artplayer-info\">\n          <div class=\"artplayer-info-panel\"></div>\n          <div class=\"artplayer-info-close\">[x]</div>\n        </div>\n        <div data-index=\"100\" class=\"artplayer-pip-header\">\n          <div class=\"artplayer-pip-title\"></div>\n          <div class=\"artplayer-pip-close\">\xD7</div>\n        </div>\n        <div data-index=\"110\" class=\"artplayer-contextmenu\"></div>\n      </div>\n    ";
+    refs.$container.innerHTML = "\n          <div class=\"artplayer-video-player\">\n            <video data-index=\"10\" class=\"artplayer-video\"></video>\n            <div data-index=\"20\" class=\"artplayer-subtitle\"></div>\n            <div data-index=\"30\" class=\"artplayer-layers\"></div>\n            <div data-index=\"40\" class=\"artplayer-mask\"></div>\n            <div data-index=\"50\" class=\"artplayer-bottom\">\n              <div class=\"artplayer-progress\"></div>\n              <div class=\"artplayer-controls\">\n                <div class=\"artplayer-controls-left\"></div>\n                <div class=\"artplayer-controls-right\"></div>\n              </div>\n            </div>\n            <div data-index=\"60\" class=\"artplayer-loading\"></div>\n            <div data-index=\"70\" class=\"artplayer-notice\">\n              <div class=\"artplayer-notice-inner\"></div>\n            </div>\n            <div data-index=\"80\" class=\"artplayer-setting\">\n              <div class=\"artplayer-setting-inner\">\n                <div class=\"artplayer-setting-body\"></div>\n                <div class=\"artplayer-setting-close\">\xD7</div>\n              </div>\n            </div>\n            <div data-index=\"90\" class=\"artplayer-info\">\n              <div class=\"artplayer-info-panel\"></div>\n              <div class=\"artplayer-info-close\">[x]</div>\n            </div>\n            <div data-index=\"100\" class=\"artplayer-pip-header\">\n              <div class=\"artplayer-pip-title\"></div>\n              <div class=\"artplayer-pip-close\">\xD7</div>\n            </div>\n            <div data-index=\"110\" class=\"artplayer-contextmenu\"></div>\n          </div>\n        ";
     refs.$player = refs.$container.querySelector('.artplayer-video-player');
     refs.$video = refs.$container.querySelector('.artplayer-video');
     refs.$subtitle = refs.$container.querySelector('.artplayer-subtitle');
@@ -741,31 +751,31 @@
     'zh-cn': {
       'About author': '关于作者',
       'Video info': '视频统计信息',
-      'Close': '关闭',
+      Close: '关闭',
       'Video load failed': '视频加载失败',
-      'Volume': '音量',
+      Volume: '音量',
-      'Play': '播放',
+      Play: '播放',
-      'Pause': '暂停',
+      Pause: '暂停',
-      'Rate': '速度',
+      Rate: '速度',
-      'Mute': '静音',
+      Mute: '静音',
-      'Flip': '视频翻转',
+      Flip: '视频翻转',
-      'Horizontal': '水平',
+      Horizontal: '水平',
-      'Vertical': '垂直',
+      Vertical: '垂直',
-      'Reconnect': '重新连接',
+      Reconnect: '重新连接',
       'Hide subtitle': '隐藏字幕',
       'Show subtitle': '显示字幕',
       'Hide danmu': '隐藏弹幕',
       'Show danmu': '显示弹幕',
       'Show setting': '显示设置',
       'Hide setting': '隐藏设置',
-      'Screenshot': '截图',
+      Screenshot: '截图',
       'Play speed': '播放速度',
       'Aspect ratio': '画面比例',
-      'Default': '默认',
+      Default: '默认',
-      'Normal': '正常',
+      Normal: '正常',
       'Switch video': '切换',
       'Switch subtitle': '切换字幕',
-      'Fullscreen': '全屏',
+      Fullscreen: '全屏',
       'Exit fullscreen': '退出全屏',
       'Web fullscreen': '网页全屏',
       'Exit web fullscreen': '退出网页全屏',
@@ -774,31 +784,31 @@
     'zh-tw': {
       'About author': '關於作者',
       'Video info': '影片統計訊息',
-      'Close': '關閉',
+      Close: '關閉',
       'Video load failed': '影片載入失敗',
-      'Volume': '音量',
+      Volume: '音量',
-      'Play': '播放',
+      Play: '播放',
-      'Pause': '暫停',
+      Pause: '暫停',
-      'Rate': '速度',
+      Rate: '速度',
-      'Mute': '靜音',
+      Mute: '靜音',
-      'Flip': '影片翻轉',
+      Flip: '影片翻轉',
-      'Horizontal': '水平',
+      Horizontal: '水平',
-      'Vertical': '垂直',
+      Vertical: '垂直',
-      'Reconnect': '重新連接',
+      Reconnect: '重新連接',
       'Hide subtitle': '隱藏字幕',
       'Show subtitle': '顯示字幕',
       'Show setting': '顯示设置',
       'Hide setting': '隱藏设置',
       'Hide danmu': '隱藏彈幕',
       'Show danmu': '顯示彈幕',
-      'Screenshot': '截圖',
+      Screenshot: '截圖',
       'Play speed': '播放速度',
       'Aspect ratio': '畫面比例',
-      'Default': '默認',
+      Default: '默認',
-      'Normal': '正常',
+      Normal: '正常',
       'Switch video': '切換',
       'Switch subtitle': '切換字幕',
-      'Fullscreen': '全屏',
+      Fullscreen: '全屏',
       'Exit fullscreen': '退出全屏',
       'Web fullscreen': '網頁全屏',
       'Exit web fullscreen': '退出網頁全屏',
@@ -943,7 +953,7 @@
     art.on('video:error', function () {
       if (reconnectTime < maxReconnectTime) {
         sleep(1000).then(function () {
-          reconnectTime++;
+          reconnectTime += 1;
           art.emit('beforeMountUrl', option.url);
           $video.src = player.mountUrl(option.url);
           notice.show("".concat(i18n.get('Reconnect'), ": ").concat(reconnectTime));
@@ -1050,7 +1060,7 @@
       set: function set(percentage) {
         if (percentage !== undefined) {
           $video.volume = clamp(percentage, 0, 1);
-          notice.show("".concat(i18n.get('Volume'), ": ").concat(parseInt($video.volume * 100)));
+          notice.show("".concat(i18n.get('Volume'), ": ").concat(parseInt($video.volume * 100, 10)));
 
           if ($video.volume !== 0) {
             storage.set('volume', $video.volume);
@@ -3354,7 +3364,7 @@
             theme = _art$option.theme,
             proxy = art.events.proxy,
             player = art.player;
-        append($control, "\n        <div class=\"art-control-progress-inner\">\n          <div class=\"art-progress-loaded\"></div>\n          <div class=\"art-progress-played\" style=\"background: ".concat(theme, "\"></div>\n          <div class=\"art-progress-highlight\"></div>\n          <div class=\"art-progress-indicator\" style=\"background: ").concat(theme, "\"></div>\n          <div class=\"art-progress-tip art-tip\"></div>\n        </div>\n      "));
+        append($control, "\n              <div class=\"art-control-progress-inner\">\n                <div class=\"art-progress-loaded\"></div>\n                <div class=\"art-progress-played\" style=\"background: ".concat(theme, "\"></div>\n                <div class=\"art-progress-highlight\"></div>\n                <div class=\"art-progress-indicator\" style=\"background: ").concat(theme, "\"></div>\n                <div class=\"art-progress-tip art-tip\"></div>\n              </div>\n            "));
         this.$loaded = $control.querySelector('.art-progress-loaded');
         this.$played = $control.querySelector('.art-progress-played');
         this.$highlight = $control.querySelector('.art-progress-highlight');
@@ -3701,7 +3711,7 @@
         var _this = this;
 
         this.art = art;
-        errorHandle(art.controls.progress, '\'thumbnails\' control dependent on \'progress\' control');
+        errorHandle(art.controls.progress, "'thumbnails' control dependent on 'progress' control");
         var $progress = art.refs.$progress,
             _art$events = art.events,
             proxy = _art$events.proxy,
@@ -3743,12 +3753,12 @@
             column = _this$art$option$thum.column;
         var perWidth = $progress.clientWidth / number;
         var perIndex = Math.ceil(posWidth / perWidth);
-        var yIndex = Math.ceil(perIndex / column);
+        var yIndex = Math.ceil(perIndex / column) - 1;
-        var xIndex = perIndex % column || column;
+        var xIndex = perIndex % column || column - 1;
         setStyle(this.$control, 'backgroundImage', "url(".concat(url, ")"));
         setStyle(this.$control, 'height', "".concat(height, "px"));
         setStyle(this.$control, 'width', "".concat(width, "px"));
-        setStyle(this.$control, 'backgroundPosition', "-".concat(--xIndex * width, "px -").concat(--yIndex * height, "px"));
+        setStyle(this.$control, 'backgroundPosition', "-".concat(xIndex * width, "px -").concat(yIndex * height, "px"));
 
         if (posWidth <= width / 2) {
           setStyle(this.$control, 'left', 0);
@@ -3945,14 +3955,21 @@
         var option = control.option;
 
         if (option && !option.disable) {
-          id++;
+          id += 1;
           var name = option.name || "control".concat(id);
           var $control = document.createElement('div');
           $control.classList.value = "art-control art-control-".concat(name);
           this.mount(option.position, $control, option.index || id);
           this.commonMethod(control, $control);
-          control.apply && control.apply(this.art, $control);
+
-          callback && callback($control);
+          if (control.apply) {
+            control.apply(this.art, $control);
+          }
+
+          if (callback) {
+            callback($control);
+          }
+
           this[name] = control;
         }
       }
@@ -4026,7 +4043,7 @@
       disable: !option.playbackRate,
       name: 'playbackRate',
       index: 10,
-      html: "\n      ".concat(i18n.get('Play speed'), ":\n      <span data-rate=\"0.5\">0.5</span>\n      <span data-rate=\"0.75\">0.75</span>\n      <span data-rate=\"1\" class=\"normal current\">").concat(i18n.get('Normal'), "</span>\n      <span data-rate=\"1.25\">1.25</span>\n      <span data-rate=\"1.5\">1.5</span>\n      <span data-rate=\"2.0\">2.0</span>\n    "),
+      html: "\n          ".concat(i18n.get('Play speed'), ":\n          <span data-rate=\"0.5\">0.5</span>\n          <span data-rate=\"0.75\">0.75</span>\n          <span data-rate=\"1\" class=\"normal current\">").concat(i18n.get('Normal'), "</span>\n          <span data-rate=\"1.25\">1.25</span>\n          <span data-rate=\"1.5\">1.5</span>\n          <span data-rate=\"2.0\">2.0</span>\n        "),
       click: function click(event) {
         var target = event.target;
         var rate = target.dataset.rate;
@@ -4055,7 +4072,7 @@
       disable: !option.aspectRatio,
       name: 'aspectRatio',
       index: 20,
-      html: "\n      ".concat(i18n.get('Aspect ratio'), ":\n      <span data-ratio=\"default\" class=\"default current\">").concat(i18n.get('Default'), "</span>\n      <span data-ratio=\"4:3\">4:3</span>\n      <span data-ratio=\"16:9\">16:9</span>\n    "),
+      html: "\n          ".concat(i18n.get('Aspect ratio'), ":\n          <span data-ratio=\"default\" class=\"default current\">").concat(i18n.get('Default'), "</span>\n          <span data-ratio=\"4:3\">4:3</span>\n          <span data-ratio=\"16:9\">16:9</span>\n        "),
       click: function click(event) {
         var target = event.target;
         var ratio = target.dataset.ratio;
@@ -4093,7 +4110,7 @@
     disable: false,
     name: 'version',
     index: 40,
-    html: '<a href="https://github.com/zhw2590582/artplayer" target="_blank">ArtPlayer 1.0.2</a>'
+    html: '<a href="https://github.com/zhw2590582/artplayer" target="_blank">ArtPlayer 1.0.3</a>'
   };
 
   function close(art) {
@@ -4161,7 +4178,7 @@
         var menu = typeof item === 'function' ? item(this.art) : item;
 
         if (!menu.disable) {
-          id$1++;
+          id$1 += 1;
           var _this$art2 = this.art,
               $contextmenu = _this$art2.refs.$contextmenu,
               proxy = _this$art2.events.proxy;
@@ -4182,8 +4199,15 @@
 
           insertByIndex($contextmenu, $menu, menu.index || id$1);
           this[name] = $menu;
-          menu.callback && menu.callback($menu);
+
-          callback && callback($menu);
+          if (menu.callback) {
+            menu.callback($menu);
+          }
+
+          if (callback) {
+            callback($menu);
+          }
+
           this.art.emit('contextmenu:add', $menu);
         }
       }
@@ -4289,14 +4313,14 @@
       key: "creatInfo",
       value: function creatInfo() {
         var infoHtml = [];
-        infoHtml.push("\n      <div class=\"art-info-item \">\n        <div class=\"art-info-title\">Player version:</div>\n        <div class=\"art-info-content\">1.0.2</div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item \">\n            <div class=\"art-info-title\">Player version:</div>\n            <div class=\"art-info-content\">1.0.3</div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video url:</div>\n        <div class=\"art-info-content\" data-video=\"currentSrc\"></div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video url:</div>\n            <div class=\"art-info-content\" data-video=\"currentSrc\"></div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video type:</div>\n        <div class=\"art-info-content\" data-head=\"Content-Type\"></div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video type:</div>\n            <div class=\"art-info-content\" data-head=\"Content-Type\"></div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video size:</div>\n        <div class=\"art-info-content\" data-head=\"Content-length\"></div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video size:</div>\n            <div class=\"art-info-content\" data-head=\"Content-length\"></div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video volume:</div>\n        <div class=\"art-info-content\" data-video=\"volume\"></div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video volume:</div>\n            <div class=\"art-info-content\" data-video=\"volume\"></div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video time:</div>\n        <div class=\"art-info-content\" data-video=\"currentTime\"></div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video time:</div>\n            <div class=\"art-info-content\" data-video=\"currentTime\"></div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video duration:</div>\n        <div class=\"art-info-content\" data-video=\"duration\"></div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video duration:</div>\n            <div class=\"art-info-content\" data-video=\"duration\"></div>\n          </div>\n        ");
-        infoHtml.push("\n      <div class=\"art-info-item\">\n        <div class=\"art-info-title\">Video resolution:</div>\n        <div class=\"art-info-content\">\n          <span data-video=\"videoWidth\"></span> x <span data-video=\"videoHeight\"></span>\n        </div>\n      </div>\n    ");
+        infoHtml.push("\n          <div class=\"art-info-item\">\n            <div class=\"art-info-title\">Video resolution:</div>\n            <div class=\"art-info-content\">\n              <span data-video=\"videoWidth\"></span> x <span data-video=\"videoHeight\"></span>\n            </div>\n          </div>\n        ");
         return infoHtml.join('');
       }
     }, {
@@ -4918,6 +4942,8 @@
           _this2.proxy(image, 'error', function () {
             return reject(image);
           });
+
+          return img;
         });
       }
     }, {
@@ -5029,7 +5055,7 @@
         var layer = typeof item === 'function' ? item(this.art) : item;
 
         if (!layer.disable) {
-          id$2++;
+          id$2 += 1;
           var _this$art = this.art,
               $layers = _this$art.refs.$layers,
               proxy = _this$art.events.proxy;
@@ -5050,8 +5076,15 @@
 
           insertByIndex($layers, $layer, layer.index || id$2);
           this[name] = $layer;
-          item.callback && item.callback($layer);
+
-          callback && callback($layer);
+          if (item.callback) {
+            item.callback($layer);
+          }
+
+          if (callback) {
+            callback($layer);
+          }
+
           this.art.emit('layers:add', $layer);
         }
       }
@@ -5197,7 +5230,7 @@
             player = art.player;
         this.$header = $setting.querySelector('.art-setting-header');
         this.$body = $setting.querySelector('.art-setting-body');
-        this.$btns = append(this.$body, "\n      <div class=\"art-setting-btns\">\n        <div class=\"art-setting-btn current\">\n          <span data-flip=\"normal\">".concat(i18n.get('Normal'), "</span>\n        </div>\n        <div class=\"art-setting-btn\">\n          <span data-flip=\"horizontal\">").concat(i18n.get('Horizontal'), "</span>\n        </div>\n        <div class=\"art-setting-btn\">\n          <span data-flip=\"vertical\">").concat(i18n.get('Vertical'), "</span>\n        </div>\n      </div>\n    "));
+        this.$btns = append(this.$body, "\n              <div class=\"art-setting-btns\">\n                <div class=\"art-setting-btn current\">\n                  <span data-flip=\"normal\">".concat(i18n.get('Normal'), "</span>\n                </div>\n                <div class=\"art-setting-btn\">\n                  <span data-flip=\"horizontal\">").concat(i18n.get('Horizontal'), "</span>\n                </div>\n                <div class=\"art-setting-btn\">\n                  <span data-flip=\"vertical\">").concat(i18n.get('Vertical'), "</span>\n                </div>\n              </div>\n            "));
         proxy(this.$btns, 'click', function (event) {
           var target = event.target;
           var flip = target.dataset.flip;
@@ -5263,7 +5296,7 @@
         var option = setting.option;
 
         if (option && !option.disable) {
-          id$3++;
+          id$3 += 1;
           var _this$art2 = this.art,
               refs = _this$art2.refs,
               i18n = _this$art2.i18n;
@@ -5273,10 +5306,18 @@
           $setting.setAttribute('class', "art-setting art-setting-".concat(name));
           append($setting, "<div class=\"art-setting-header\">".concat(i18n.get(title), "</div>"));
           append($setting, '<div class="art-setting-body"></div>');
-          setting.apply && setting.apply(this.art, $setting);
+
+          if (setting.apply) {
+            setting.apply(this.art, $setting);
+          }
+
           insertByIndex(refs.$settingBody, $setting, option.index || id$3);
           this[name] = $setting;
-          callback && callback($setting);
+
+          if (callback) {
+            callback($setting);
+          }
+
           this.art.emit('setting:add', $setting);
         }
       }
@@ -5310,6 +5351,23 @@
     return Setting;
   }();
 
+  function _defineProperty(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+
+    return obj;
+  }
+
+  var defineProperty = _defineProperty;
+
   var Storage =
   /*#__PURE__*/
   function () {
@@ -5365,7 +5423,7 @@
       classCallCheck(this, Artplayer);
 
       _this = possibleConstructorReturn(this, getPrototypeOf(Artplayer).call(this));
-      _this.option = deepMerge({}, Artplayer.DEFAULTS, option);
+      _this.option = deepmerge_1(Artplayer.DEFAULTS, option);
       optionValidator(_this.option, scheme);
 
       _this.init();
@@ -5409,7 +5467,8 @@
         this.hotkey = new Hotkey(this);
         this.mask = new Mask(this);
         this.setting = new Setting$1(this);
-        this.id = id$4++;
+        id$4 += 1;
+        this.id = id$4;
         Artplayer.instances.push(this);
       }
     }, {
@@ -5429,14 +5488,18 @@
       }
     }], [{
       key: "use",
-      value: function use(plugin) {
+      value: function use() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+
+        var plugin = args[0];
         var installedPlugins = this.plugins || (this.plugins = []);
 
         if (installedPlugins.indexOf === -1) {
           installedPlugins.push(plugin);
-          var args = Array.from(arguments).slice(1);
           args.unshift(this);
-          plugin.apply(null, args);
+          plugin.apply(void 0, toConsumableArray(args.slice(1)));
           this.prototype.emit('use', plugin);
         }
 
@@ -5445,7 +5508,7 @@
     }, {
       key: "version",
       get: function get() {
-        return '1.0.2';
+        return '1.0.3';
       }
     }, {
       key: "config",

docs/lab/js/artplayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"artplayer.js","sources":["../../../packages/artplayer/node_modules/@babel/runtime/helpers/classCallCheck.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/createClass.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/typeof.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/inherits.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/defineProperty.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/objectSpread.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/toConsumableArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/isNativeFunction.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/construct.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../../packages/artplayer/src/utils/index.js","../../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../../packages/artplayer/src/scheme/validElement.js","../../../packages/artplayer/src/scheme/validStringEmpty.js","../../../packages/artplayer/src/scheme/index.js","../../../packages/artplayer/src/config/mimeCodec.js","../../../packages/artplayer/src/config/mse.js","../../../packages/artplayer/src/config/video.js","../../../packages/artplayer/src/config/index.js","../../../packages/artplayer/node_modules/tiny-emitter/index.js","../../../packages/artplayer/src/template.js","../../../packages/artplayer/src/i18n.js","../../../packages/artplayer/src/player/mountUrlMix.js","../../../packages/artplayer/src/player/attrInit.js","../../../packages/artplayer/src/player/eventInit.js","../../../packages/artplayer/src/player/playMix.js","../../../packages/artplayer/src/player/pauseMin.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/node_modules/get-size/get-size.js","../../../packages/artplayer/node_modules/ev-emitter/ev-emitter.js","../../../packages/artplayer/node_modules/unipointer/unipointer.js","../../../packages/artplayer/node_modules/unidragger/unidragger.js","../../../packages/artplayer/node_modules/draggabilly/draggabilly.js","../../../packages/artplayer/src/player/pipMix.js","../../../packages/artplayer/src/player/loadedMix.js","../../../packages/artplayer/src/player/playedMix.js","../../../packages/artplayer/src/player/autoSizeMix.js","../../../packages/artplayer/src/player/flipMix.js","../../../packages/artplayer/src/player/index.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArrayLimit.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableRest.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/slicedToArray.js","../../../packages/artplayer/src/icons/index.js","../../../packages/artplayer/src/controls/fullscreen.js","../../../packages/artplayer/src/controls/fullscreenWeb.js","../../../packages/artplayer/src/controls/pip.js","../../../packages/artplayer/src/controls/playAndPause.js","../../../packages/artplayer/src/controls/progress.js","../../../packages/artplayer/src/controls/subtitle.js","../../../packages/artplayer/src/controls/time.js","../../../packages/artplayer/src/controls/volume.js","../../../packages/artplayer/src/controls/setting.js","../../../packages/artplayer/src/controls/thumbnails.js","../../../packages/artplayer/src/controls/screenshot.js","../../../packages/artplayer/src/controls/quality.js","../../../packages/artplayer/src/controls/index.js","../../../packages/artplayer/src/contextmenu/playbackRate.js","../../../packages/artplayer/src/contextmenu/aspectRatio.js","../../../paLine truncated
+{"version":3,"file":"artplayer.js","sources":["../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/toConsumableArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/classCallCheck.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/createClass.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/typeof.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/inherits.js","../../../packages/artplayer/node_modules/tiny-emitter/index.js","../../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../../packages/artplayer/node_modules/deepmerge/dist/es.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/isNativeFunction.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/construct.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../../packages/artplayer/src/utils/index.js","../../../packages/artplayer/src/scheme/validElement.js","../../../packages/artplayer/src/scheme/validStringEmpty.js","../../../packages/artplayer/src/scheme/index.js","../../../packages/artplayer/src/config/mimeCodec.js","../../../packages/artplayer/src/config/mse.js","../../../packages/artplayer/src/config/video.js","../../../packages/artplayer/src/config/index.js","../../../packages/artplayer/src/template.js","../../../packages/artplayer/src/i18n.js","../../../packages/artplayer/src/player/mountUrlMix.js","../../../packages/artplayer/src/player/attrInit.js","../../../packages/artplayer/src/player/eventInit.js","../../../packages/artplayer/src/player/playMix.js","../../../packages/artplayer/src/player/pauseMin.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/node_modules/get-size/get-size.js","../../../packages/artplayer/node_modules/ev-emitter/ev-emitter.js","../../../packages/artplayer/node_modules/unipointer/unipointer.js","../../../packages/artplayer/node_modules/unidragger/unidragger.js","../../../packages/artplayer/node_modules/draggabilly/draggabilly.js","../../../packages/artplayer/src/player/pipMix.js","../../../packages/artplayer/src/player/loadedMix.js","../../../packages/artplayer/src/player/playedMix.js","../../../packages/artplayer/src/player/autoSizeMix.js","../../../packages/artplayer/src/player/flipMix.js","../../../packages/artplayer/src/player/index.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArrayLimit.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableRest.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/slicedToArray.js","../../../packages/artplayer/src/icons/index.js","../../../packages/artplayer/src/controls/fullscreen.js","../../../packages/artplayer/src/controls/fullscreenWeb.js","../../../packages/artplayer/src/controls/pip.js","../../../packages/artplayer/src/controls/playAndPause.js","../../../packages/artplayer/src/controls/progress.js","../../../packages/artplayer/src/controls/subtitle.js","../../../packages/artplayer/src/controls/time.js","../../../packages/artplayer/src/controls/volume.js","../../../packages/artplayer/src/controls/setting.js","../../../packages/artplayer/src/controls/thumbnails.js","../../../packages/artplayer/src/controls/screenshot.js","../../../packages/artplayer/src/controls/quality.js","../../../packages/artplayer/src/controls/index.js","../../../packages/artplayer/src/contextmenu/playbackRate.js","../../../packages/artplayer/src/contextmenu/aspectRatio.js","../../../packages/artplayer/src/contextmenu/info.js","../../../packages/artplayer/src/contextmenu/version.js","..Line truncated

packages/artplayer/package.json

@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "balloon-css": "^0.5.0",
+    "deepmerge": "^2.2.1",
     "draggabilly": "^2.2.0",
     "option-validator": "^1.1.1",
     "resize-observer": "^1.0.0-alpha.1",

packages/artplayer/src/config/index.js

@@ -3,7 +3,7 @@ import mse from './mse';
 import video from './video';
 
 export default {
-  mimeCodec,
+    mimeCodec,
-  mse,
+    mse,
-  video
+    video,
 };

packages/artplayer/src/config/mimeCodec.js

@@ -1,5 +1,5 @@
 export default {
-  mp4: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',
+    mp4: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',
-  webm: 'video/webm; codecs="vorbis, vp8"',
+    webm: 'video/webm; codecs="vorbis, vp8"',
-  ts: 'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"'
+    ts: 'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"',
 };

packages/artplayer/src/config/mse.js

@@ -1,58 +1,33 @@
 export default {
-  mediaSource: {
+    mediaSource: {
-    propertys: [
+        propertys: ['activeSourceBuffers', 'duration', 'readyState', 'sourceBuffers'],
-      'activeSourceBuffers',
+        methods: [
-      'duration',
+            'addSourceBuffer',
-      'readyState',
+            'endOfStream',
-      'sourceBuffers'
+            'removeSourceBuffer',
-    ],
+            'clearLiveSeekableRange',
-    methods: [
+            'setLiveSeekableRange',
-      'addSourceBuffer',
+        ],
-      'endOfStream',
+        events: ['sourceclose', 'sourceended', 'sourceopen'],
-      'removeSourceBuffer',
+    },
-      'clearLiveSeekableRange',
+    sourceBuffer: {
-      'setLiveSeekableRange'
+        propertys: [
-    ],
+            'mode',
-    events: [
+            'updating',
-      'sourceclose',
+            'buffered',
-      'sourceended',
+            'timestampOffset',
-      'sourceopen'
+            'audioTracks',
-    ]
+            'videoTracks',
-  },
+            'textTracks',
-  sourceBuffer: {
+            'appendWindowStart',
-    propertys: [
+            'appendWindowEnd',
-      'mode',
+            'trackDefaults',
-      'updating',
+        ],
-      'buffered',
+        methods: ['appendBuffer', 'appendStream', 'abort', 'remove'],
-      'timestampOffset',
+        events: ['abort', 'error', 'update', 'updateend', 'updatestart'],
-      'audioTracks',
+    },
-      'videoTracks',
+    sourceBufferList: {
-      'textTracks',
+        propertys: ['length'],
-      'appendWindowStart',
+        events: ['addsourcebuffer', 'removesourcebuffer'],
-      'appendWindowEnd',
+    },
-      'trackDefaults'
-    ],
-    methods: [
-      'appendBuffer',
-      'appendStream',
-      'abort',
-      'remove'
-    ],
-    events: [
-      'abort',
-      'error',
-      'update',
-      'updateend',
-      'updatestart'
-    ]
-  },
-  sourceBufferList: {
-    propertys: [
-      'length'
-    ],
-    events: [
-      'addsourcebuffer',
-      'removesourcebuffer'
-    ]
-  }
 };

packages/artplayer/src/config/video.js

@@ -1,64 +1,58 @@
 export default {
-  propertys: [
+    propertys: [
-    'audioTracks',
+        'audioTracks',
-    'autoplay',
+        'autoplay',
-    'buffered',
+        'buffered',
-    'controller',
+        'controller',
-    'controls',
+        'controls',
-    'crossOrigin',
+        'crossOrigin',
-    'currentSrc',
+        'currentSrc',
-    'currentTime',
+        'currentTime',
-    'defaultMuted',
+        'defaultMuted',
-    'defaultPlaybackRate',
+        'defaultPlaybackRate',
-    'duration',
+        'duration',
-    'ended',
+        'ended',
-    'error',
+        'error',
-    'loop',
+        'loop',
-    'mediaGroup',
+        'mediaGroup',
-    'muted',
+        'muted',
-    'networkState',
+        'networkState',
-    'paused',
+        'paused',
-    'playbackRate',
+        'playbackRate',
-    'played',
+        'played',
-    'preload',
+        'preload',
-    'readyState',
+        'readyState',
-    'seekable',
+        'seekable',
-    'seeking',
+        'seeking',
-    'src',
+        'src',
-    'startDate',
+        'startDate',
-    'textTracks',
+        'textTracks',
-    'videoTracks',
+        'videoTracks',
-    'volume'
+        'volume',
-  ],
+    ],
-  methods: [
+    methods: ['addTextTrack', 'canPlayType', 'load', 'play', 'pause'],
-    'addTextTrack',
+    events: [
-    'canPlayType',
+        'abort',
-    'load',
+        'canplay',
-    'play',
+        'canplaythrough',
-    'pause'
+        'durationchange',
-  ],
+        'emptied',
-  events: [
+        'ended',
-    'abort',
+        'error',
-    'canplay',
+        'loadeddata',
-    'canplaythrough',
+        'loadedmetadata',
-    'durationchange',
+        'loadstart',
-    'emptied',
+        'pause',
-    'ended',
+        'play',
-    'error',
+        'playing',
-    'loadeddata',
+        'progress',
-    'loadedmetadata',
+        'ratechange',
-    'loadstart',
+        'seeked',
-    'pause',
+        'seeking',
-    'play',
+        'stalled',
-    'playing',
+        'suspend',
-    'progress',
+        'timeupdate',
-    'ratechange',
+        'volumechange',
-    'seeked',
+        'waiting',
-    'seeking',
+    ],
-    'stalled',
-    'suspend',
-    'timeupdate',
-    'volumechange',
-    'waiting'
-  ]
 };

packages/artplayer/src/contextmenu/aspectRatio.js

@@ -1,32 +1,32 @@
 import { inverseClass } from '../utils';
 
 export default function aspectRatio(art) {
-  const { option, i18n, player } = art;
+    const { option, i18n, player } = art;
-  return {
+    return {
-    disable: !option.aspectRatio,
+        disable: !option.aspectRatio,
-    name: 'aspectRatio',
+        name: 'aspectRatio',
-    index: 20,
+        index: 20,
-    html: `
+        html: `
-      ${i18n.get('Aspect ratio')}:
+          ${i18n.get('Aspect ratio')}:
-      <span data-ratio="default" class="default current">${i18n.get('Default')}</span>
+          <span data-ratio="default" class="default current">${i18n.get('Default')}</span>
-      <span data-ratio="4:3">4:3</span>
+          <span data-ratio="4:3">4:3</span>
-      <span data-ratio="16:9">16:9</span>
+          <span data-ratio="16:9">16:9</span>
-    `,
+        `,
-    click: event => {
+        click: event => {
-      const { target } = event;
+            const { target } = event;
-      const { ratio } = target.dataset;
+            const { ratio } = target.dataset;
-      if (ratio) {
+            if (ratio) {
-        player.aspectRatio(ratio.split(':'));
+                player.aspectRatio(ratio.split(':'));
-        art.contextmenu.hide();
+                art.contextmenu.hide();
-      }
+            }
-    },
+        },
-    callback: $menu => {
+        callback: $menu => {
-      art.on('aspectRatioChange', ratio => {
+            art.on('aspectRatioChange', ratio => {
-        const $current = Array.from($menu.querySelectorAll('span')).find(
+                const $current = Array.from($menu.querySelectorAll('span')).find(
-          item => item.dataset.ratio === ratio.join(':')
+                    item => item.dataset.ratio === ratio.join(':'),
-        );
+                );
-        inverseClass($current, 'current');
+                inverseClass($current, 'current');
-      });
+            });
-    }
+        },
-  };
+    };
 }

packages/artplayer/src/contextmenu/close.js

@@ -1,11 +1,11 @@
 export default function close(art) {
-  return {
+    return {
-    disable: false,
+        disable: false,
-    name: 'close',
+        name: 'close',
-    index: 50,
+        index: 50,
-    html: art.i18n.get('Close'),
+        html: art.i18n.get('Close'),
-    click: () => {
+        click: () => {
-      art.contextmenu.hide();
+            art.contextmenu.hide();
-    }
+        },
-  };
+    };
 }

packages/artplayer/src/contextmenu/index.js

@@ -7,97 +7,108 @@ import close from './close';
 
 let id = 0;
 export default class Contextmenu {
-  constructor(art) {
+    constructor(art) {
-    id = 0;
+        id = 0;
-    this.art = art;
+        this.art = art;
-    this.art.on('firstCanplay', () => {
+        this.art.on('firstCanplay', () => {
-      this.init();
+            this.init();
-    });
-  }
-
-  init() {
-    const { option, refs: { $player, $contextmenu }, events: { proxy } } = this.art;
-
-    option.contextmenu.push(
-      playbackRate,
-      aspectRatio,
-      info,
-      version,
-      close
-    );
-
-    option.contextmenu.forEach(item => {
-      this.add(item);
-    });
-
-    proxy($player, 'contextmenu', event => {
-      event.preventDefault();
-      this.show();
-      this.setPos(event);
-    });
-
-    proxy($player, 'click', event => {
-      if (!event.composedPath().includes($contextmenu)) {
-        this.hide();
-      }
-    });
-  }
-
-  add(item, callback) {
-    const menu = typeof item === 'function' ? item(this.art) : item;
-    if (!menu.disable) {
-      id++;
-      const { refs: { $contextmenu }, events: { proxy } } = this.art;
-      const name = menu.name || `contextmenu${id}`;
-      const $menu = document.createElement('div');
-      $menu.classList.value = `art-contextmenu art-contextmenu-${name}`;
-      setStyles($menu, menu.style || {});
-      append($menu, menu.html);
-      if (menu.click) {
-        proxy($menu, 'click', event => {
-          event.preventDefault();
-          menu.click.call(this, event);
-          this.art.emit('contextmenu:click', $menu);
         });
-      }
-      insertByIndex($contextmenu, $menu, menu.index || id);
-      this[name] = $menu;
-      menu.callback && menu.callback($menu);
-      callback && callback($menu);
-      this.art.emit('contextmenu:add', $menu);
-    }
-  }
-
-  setPos(event) {
-    const { refs: { $player, $contextmenu } } = this.art;
-    const mouseX = event.clientX;
-    const mouseY = event.clientY;
-    const { height: cHeight, width: cWidth, left: cLeft, top: cTop } = $player.getBoundingClientRect();
-    const { height: mHeight, width: mWidth } = $contextmenu.getBoundingClientRect();
-    let menuLeft = mouseX - cLeft;
-    let menuTop = mouseY - cTop;
-
-    if (mouseX + mWidth > cLeft + cWidth) {
-      menuLeft = cWidth - mWidth;
     }
 
-    if (mouseY + mHeight > cTop + cHeight) {
+    init() {
-      menuTop = cHeight - mHeight;
+        const {
+            option,
+            refs: { $player, $contextmenu },
+            events: { proxy },
+        } = this.art;
+
+        option.contextmenu.push(playbackRate, aspectRatio, info, version, close);
+
+        option.contextmenu.forEach(item => {
+            this.add(item);
+        });
+
+        proxy($player, 'contextmenu', event => {
+            event.preventDefault();
+            this.show();
+            this.setPos(event);
+        });
+
+        proxy($player, 'click', event => {
+            if (!event.composedPath().includes($contextmenu)) {
+                this.hide();
+            }
+        });
     }
 
-    setStyle($contextmenu, 'left', `${menuLeft}px`);
+    add(item, callback) {
-    setStyle($contextmenu, 'top', `${menuTop}px`);
+        const menu = typeof item === 'function' ? item(this.art) : item;
-  }
+        if (!menu.disable) {
+            id += 1;
+            const {
+                refs: { $contextmenu },
+                events: { proxy },
+            } = this.art;
+            const name = menu.name || `contextmenu${id}`;
+            const $menu = document.createElement('div');
+            $menu.classList.value = `art-contextmenu art-contextmenu-${name}`;
+            setStyles($menu, menu.style || {});
+            append($menu, menu.html);
+            if (menu.click) {
+                proxy($menu, 'click', event => {
+                    event.preventDefault();
+                    menu.click.call(this, event);
+                    this.art.emit('contextmenu:click', $menu);
+                });
+            }
+            insertByIndex($contextmenu, $menu, menu.index || id);
+            this[name] = $menu;
+            if (menu.callback) {
+                menu.callback($menu);
+            }
+            if (callback) {
+                callback($menu);
+            }
+            this.art.emit('contextmenu:add', $menu);
+        }
+    }
 
-  hide() {
+    setPos(event) {
-    const { refs: { $contextmenu } } = this.art;
+        const {
-    setStyle($contextmenu, 'display', 'none');
+            refs: { $player, $contextmenu },
-    this.art.emit('contextmenu:hide', $contextmenu);
+        } = this.art;
-  }
+        const mouseX = event.clientX;
+        const mouseY = event.clientY;
+        const { height: cHeight, width: cWidth, left: cLeft, top: cTop } = $player.getBoundingClientRect();
+        const { height: mHeight, width: mWidth } = $contextmenu.getBoundingClientRect();
+        let menuLeft = mouseX - cLeft;
+        let menuTop = mouseY - cTop;
 
-  show() {
+        if (mouseX + mWidth > cLeft + cWidth) {
-    const { refs: { $contextmenu } } = this.art;
+            menuLeft = cWidth - mWidth;
-    setStyle($contextmenu, 'display', 'block');
+        }
-    this.art.emit('contextmenu:show', $contextmenu);
+
-  }
+        if (mouseY + mHeight > cTop + cHeight) {
+            menuTop = cHeight - mHeight;
+        }
+
+        setStyle($contextmenu, 'left', `${menuLeft}px`);
+        setStyle($contextmenu, 'top', `${menuTop}px`);
+    }
+
+    hide() {
+        const {
+            refs: { $contextmenu },
+        } = this.art;
+        setStyle($contextmenu, 'display', 'none');
+        this.art.emit('contextmenu:hide', $contextmenu);
+    }
+
+    show() {
+        const {
+            refs: { $contextmenu },
+        } = this.art;
+        setStyle($contextmenu, 'display', 'block');
+        this.art.emit('contextmenu:show', $contextmenu);
+    }
 }

packages/artplayer/src/contextmenu/info.js

@@ -1,12 +1,12 @@
 export default function info(art) {
-  return {
+    return {
-    disable: false,
+        disable: false,
-    name: 'info',
+        name: 'info',
-    index: 30,
+        index: 30,
-    html: art.i18n.get('Video info'),
+        html: art.i18n.get('Video info'),
-    click: () => {
+        click: () => {
-      art.info.show();
+            art.info.show();
-      art.contextmenu.hide();
+            art.contextmenu.hide();
-    }
+        },
-  };
+    };
 }

packages/artplayer/src/contextmenu/playbackRate.js

@@ -1,35 +1,35 @@
 import { inverseClass } from '../utils';
 
 export default function playbackRate(art) {
-  const { option, i18n, player } = art;
+    const { option, i18n, player } = art;
-  return {
+    return {
-    disable: !option.playbackRate,
+        disable: !option.playbackRate,
-    name: 'playbackRate',
+        name: 'playbackRate',
-    index: 10,
+        index: 10,
-    html: `
+        html: `
-      ${i18n.get('Play speed')}:
+          ${i18n.get('Play speed')}:
-      <span data-rate="0.5">0.5</span>
+          <span data-rate="0.5">0.5</span>
-      <span data-rate="0.75">0.75</span>
+          <span data-rate="0.75">0.75</span>
-      <span data-rate="1" class="normal current">${i18n.get('Normal')}</span>
+          <span data-rate="1" class="normal current">${i18n.get('Normal')}</span>
-      <span data-rate="1.25">1.25</span>
+          <span data-rate="1.25">1.25</span>
-      <span data-rate="1.5">1.5</span>
+          <span data-rate="1.5">1.5</span>
-      <span data-rate="2.0">2.0</span>
+          <span data-rate="2.0">2.0</span>
-    `,
+        `,
-    click: event => {
+        click: event => {
-      const { target } = event;
+            const { target } = event;
-      const { rate } = target.dataset;
+            const { rate } = target.dataset;
-      if (rate) {
+            if (rate) {
-        player.playbackRate(Number(rate));
+                player.playbackRate(Number(rate));
-        art.contextmenu.hide();
+                art.contextmenu.hide();
-      }
+            }
-    },
+        },
-    callback: $menu => {
+        callback: $menu => {
-      art.on('playbackRateChange', rate => {
+            art.on('playbackRateChange', rate => {
-        const $current = Array.from($menu.querySelectorAll('span')).find(
+                const $current = Array.from($menu.querySelectorAll('span')).find(
-          item => Number(item.dataset.rate) === rate
+                    item => Number(item.dataset.rate) === rate,
-        );
+                );
-        inverseClass($current, 'current');
+                inverseClass($current, 'current');
-      });
+            });
-    }
+        },
-  };
+    };
 }

packages/artplayer/src/contextmenu/version.js

@@ -1,6 +1,6 @@
 export default {
-  disable: false,
+    disable: false,
-  name: 'version',
+    name: 'version',
-  index: 40,
+    index: 40,
-  html: '<a href="https://github.com/zhw2590582/artplayer" target="_blank">ArtPlayer __VERSION__</a>'
+    html: '<a href="https://github.com/zhw2590582/artplayer" target="_blank">ArtPlayer __VERSION__</a>',
 };

packages/artplayer/src/controls/fullscreen.js

@@ -2,27 +2,31 @@ import { append, tooltip, setStyle } from '../utils';
 import icons from '../icons';
 
 export default class Fullscreen {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, i18n, player } = art;
+        const {
-    this.$fullscreen = append($control, icons.fullscreen);
+            events: { proxy },
-    tooltip(this.$fullscreen, i18n.get('Fullscreen'));
+            i18n,
+            player,
+        } = art;
+        this.$fullscreen = append($control, icons.fullscreen);
+        tooltip(this.$fullscreen, i18n.get('Fullscreen'));
 
-    proxy($control, 'click', () => {
+        proxy($control, 'click', () => {
-      player.fullscreenToggle();
+            player.fullscreenToggle();
-    });
+        });
 
-    art.on('fullscreen:enabled', () => {
+        art.on('fullscreen:enabled', () => {
-      setStyle(this.$fullscreen, 'opacity', '0.8');
+            setStyle(this.$fullscreen, 'opacity', '0.8');
-      tooltip(this.$fullscreen, i18n.get('Exit fullscreen'));
+            tooltip(this.$fullscreen, i18n.get('Exit fullscreen'));
-    });
+        });
 
-    art.on('fullscreen:exit', () => {
+        art.on('fullscreen:exit', () => {
-      setStyle(this.$fullscreen, 'opacity', '1');
+            setStyle(this.$fullscreen, 'opacity', '1');
-      tooltip(this.$fullscreen, i18n.get('Fullscreen'));
+            tooltip(this.$fullscreen, i18n.get('Fullscreen'));
-    });
+        });
-  }
+    }
 }

packages/artplayer/src/controls/fullscreenWeb.js

@@ -2,27 +2,31 @@ import { append, tooltip, setStyle } from '../utils';
 import icons from '../icons';
 
 export default class FullscreenWeb {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, i18n, player } = art;
+        const {
-    this.$fullscreenWeb = append($control, icons.fullscreenWeb);
+            events: { proxy },
-    tooltip(this.$fullscreenWeb, i18n.get('Web fullscreen'));
+            i18n,
+            player,
+        } = art;
+        this.$fullscreenWeb = append($control, icons.fullscreenWeb);
+        tooltip(this.$fullscreenWeb, i18n.get('Web fullscreen'));
 
-    proxy($control, 'click', () => {
+        proxy($control, 'click', () => {
-      player.fullscreenWebToggle();
+            player.fullscreenWebToggle();
-    });
+        });
 
-    art.on('fullscreenWeb:enabled', () => {
+        art.on('fullscreenWeb:enabled', () => {
-      setStyle(this.$fullscreenWeb, 'opacity', '0.8');
+            setStyle(this.$fullscreenWeb, 'opacity', '0.8');
-      tooltip(this.$fullscreenWeb, i18n.get('Exit web fullscreen'));
+            tooltip(this.$fullscreenWeb, i18n.get('Exit web fullscreen'));
-    });
+        });
 
-    art.on('fullscreenWeb:exit', () => {
+        art.on('fullscreenWeb:exit', () => {
-      setStyle(this.$fullscreenWeb, 'opacity', '1');
+            setStyle(this.$fullscreenWeb, 'opacity', '1');
-      tooltip(this.$fullscreenWeb, i18n.get('Web fullscreen'));
+            tooltip(this.$fullscreenWeb, i18n.get('Web fullscreen'));
-    });
+        });
-  }
+    }
 }

packages/artplayer/src/controls/index.js

@@ -14,159 +14,187 @@ import Quality from './quality';
 
 let id = 0;
 export default class Controls {
-  constructor(art) {
+    constructor(art) {
-    id = 0;
+        id = 0;
-    this.art = art;
+        this.art = art;
-    this.art.on('firstCanplay', () => {
+        this.art.on('firstCanplay', () => {
-      this.init();
+            this.init();
-    });
+        });
-  }
-
-  init() {
-    this.add(new Progress({
-      name: 'progress',
-      disable: false,
-      position: 'top',
-      index: 10
-    }));
-
-    this.add(new Thumbnails({
-      name: 'thumbnails',
-      disable: !this.art.option.thumbnails.url,
-      position: 'top',
-      index: 20
-    }));
-
-    this.add(new PlayAndPause({
-      name: 'playAndPause',
-      disable: false,
-      position: 'left',
-      index: 10
-    }));
-
-    this.add(new Volume({
-      name: 'volume',
-      disable: false,
-      position: 'left',
-      index: 20
-    }));
-
-    this.add(new Time({
-      name: 'time',
-      disable: false,
-      position: 'left',
-      index: 30
-    }));
-
-    this.add(new Quality({
-      name: 'quality',
-      disable: this.art.option.quality.length === 0,
-      position: 'right',
-      index: 10
-    }));
-
-    this.add(new Screenshot({
-      name: 'screenshot',
-      disable: !this.art.option.screenshot,
-      position: 'right',
-      index: 20
-    }));
-
-    this.add(new Subtitle({
-      name: 'subtitle',
-      disable: !this.art.option.subtitle.url,
-      position: 'right',
-      index: 30
-    }));
-
-    this.add(new Setting({
-      name: 'setting',
-      disable: !this.art.option.setting,
-      position: 'right',
-      index: 40
-    }));
-
-    this.add(new Pip({
-      name: 'pip',
-      disable: !this.art.option.pip,
-      position: 'right',
-      index: 50
-    }));
-
-    this.add(new FullscreenWeb({
-      name: 'fullscreenWeb',
-      disable: !this.art.option.fullscreenWeb,
-      position: 'right',
-      index: 60
-    }));
-
-    this.add(new Fullscreen({
-      name: 'fullscreen',
-      disable: !this.art.option.fullscreen,
-      position: 'right',
-      index: 70
-    }));
-
-    this.art.option.controls.forEach(item => {
-      this.add(item);
-    });
-  }
-
-  add(control, callback) {
-    const { option } = control;
-    if (option && !option.disable) {
-      id++;
-      const name = option.name || `control${id}`;
-      const $control = document.createElement('div');
-      $control.classList.value = `art-control art-control-${name}`;
-      this.mount(option.position, $control, option.index || id);
-      this.commonMethod(control, $control);
-      control.apply && control.apply(this.art, $control);
-      callback && callback($control);
-      this[name] = control;
     }
-  }
 
-  mount(position, $control, index) {
+    init() {
-    const { $progress, $controlsLeft, $controlsRight } = this.art.refs;
+        this.add(
-    switch (position) {
+            new Progress({
-      case 'top':
+                name: 'progress',
-        insertByIndex($progress, $control, index);
+                disable: false,
-        break;
+                position: 'top',
-      case 'left':
+                index: 10,
-        insertByIndex($controlsLeft, $control, index);
+            }),
-        break;
+        );
-      case 'right':
+
-        insertByIndex($controlsRight, $control, index);
+        this.add(
-        break;
+            new Thumbnails({
-      default:
+                name: 'thumbnails',
-        break;
+                disable: !this.art.option.thumbnails.url,
+                position: 'top',
+                index: 20,
+            }),
+        );
+
+        this.add(
+            new PlayAndPause({
+                name: 'playAndPause',
+                disable: false,
+                position: 'left',
+                index: 10,
+            }),
+        );
+
+        this.add(
+            new Volume({
+                name: 'volume',
+                disable: false,
+                position: 'left',
+                index: 20,
+            }),
+        );
+
+        this.add(
+            new Time({
+                name: 'time',
+                disable: false,
+                position: 'left',
+                index: 30,
+            }),
+        );
+
+        this.add(
+            new Quality({
+                name: 'quality',
+                disable: this.art.option.quality.length === 0,
+                position: 'right',
+                index: 10,
+            }),
+        );
+
+        this.add(
+            new Screenshot({
+                name: 'screenshot',
+                disable: !this.art.option.screenshot,
+                position: 'right',
+                index: 20,
+            }),
+        );
+
+        this.add(
+            new Subtitle({
+                name: 'subtitle',
+                disable: !this.art.option.subtitle.url,
+                position: 'right',
+                index: 30,
+            }),
+        );
+
+        this.add(
+            new Setting({
+                name: 'setting',
+                disable: !this.art.option.setting,
+                position: 'right',
+                index: 40,
+            }),
+        );
+
+        this.add(
+            new Pip({
+                name: 'pip',
+                disable: !this.art.option.pip,
+                position: 'right',
+                index: 50,
+            }),
+        );
+
+        this.add(
+            new FullscreenWeb({
+                name: 'fullscreenWeb',
+                disable: !this.art.option.fullscreenWeb,
+                position: 'right',
+                index: 60,
+            }),
+        );
+
+        this.add(
+            new Fullscreen({
+                name: 'fullscreen',
+                disable: !this.art.option.fullscreen,
+                position: 'right',
+                index: 70,
+            }),
+        );
+
+        this.art.option.controls.forEach(item => {
+            this.add(item);
+        });
     }
-  }
 
-  commonMethod(control, $control) {
+    add(control, callback) {
-    Object.defineProperty(control, 'hide', {
+        const { option } = control;
-      value: () => {
+        if (option && !option.disable) {
-        setStyle($control, 'display', 'none');
+            id += 1;
-        this.art.emit('control:hide', $control);
+            const name = option.name || `control${id}`;
-      }
+            const $control = document.createElement('div');
-    });
+            $control.classList.value = `art-control art-control-${name}`;
+            this.mount(option.position, $control, option.index || id);
+            this.commonMethod(control, $control);
+            if (control.apply) {
+                control.apply(this.art, $control);
+            }
+            if (callback) {
+                callback($control);
+            }
+            this[name] = control;
+        }
+    }
 
-    Object.defineProperty(control, 'show', {
+    mount(position, $control, index) {
-      value: () => {
+        const { $progress, $controlsLeft, $controlsRight } = this.art.refs;
-        setStyle($control, 'display', 'block');
+        switch (position) {
-        this.art.emit('control:show', $control);
+            case 'top':
-      }
+                insertByIndex($progress, $control, index);
-    });
+                break;
-  }
+            case 'left':
+                insertByIndex($controlsLeft, $control, index);
+                break;
+            case 'right':
+                insertByIndex($controlsRight, $control, index);
+                break;
+            default:
+                break;
+        }
+    }
 
-  show() {
+    commonMethod(control, $control) {
-    const { $player } = this.art.refs;
+        Object.defineProperty(control, 'hide', {
-    $player.classList.add('artplayer-controls-show');
+            value: () => {
-  }
+                setStyle($control, 'display', 'none');
+                this.art.emit('control:hide', $control);
+            },
+        });
 
-  hide() {
+        Object.defineProperty(control, 'show', {
-    const { $player } = this.art.refs;
+            value: () => {
-    $player.classList.remove('artplayer-controls-show');
+                setStyle($control, 'display', 'block');
-  }
+                this.art.emit('control:show', $control);
+            },
+        });
+    }
+
+    show() {
+        const { $player } = this.art.refs;
+        $player.classList.add('artplayer-controls-show');
+    }
+
+    hide() {
+        const { $player } = this.art.refs;
+        $player.classList.remove('artplayer-controls-show');
+    }
 }

packages/artplayer/src/controls/pip.js

@@ -2,16 +2,20 @@ import { append, tooltip } from '../utils';
 import icons from '../icons';
 
 export default class Pip {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, i18n, player } = art;
+        const {
-    this.$pip = append($control, icons.pip);
+            events: { proxy },
-    tooltip(this.$pip, i18n.get('Mini player'));
+            i18n,
-    proxy($control, 'click', () => {
+            player,
-      player.pipEnabled();
+        } = art;
-    });
+        this.$pip = append($control, icons.pip);
-  }
+        tooltip(this.$pip, i18n.get('Mini player'));
+        proxy($control, 'click', () => {
+            player.pipEnabled();
+        });
+    }
 }

packages/artplayer/src/controls/playAndPause.js

@@ -2,34 +2,38 @@ import { append, tooltip, setStyle } from '../utils';
 import icons from '../icons';
 
 export default class PlayAndPause {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, player, i18n } = art;
+        const {
-    this.$play = append($control, icons.play);
+            events: { proxy },
-    this.$pause = append($control, icons.pause);
+            player,
-    tooltip(this.$play, i18n.get('Play'));
+            i18n,
-    tooltip(this.$pause, i18n.get('Pause'));
+        } = art;
-    setStyle(this.$pause, 'display', 'none');
+        this.$play = append($control, icons.play);
+        this.$pause = append($control, icons.pause);
+        tooltip(this.$play, i18n.get('Play'));
+        tooltip(this.$pause, i18n.get('Pause'));
+        setStyle(this.$pause, 'display', 'none');
 
-    proxy(this.$play, 'click', () => {
+        proxy(this.$play, 'click', () => {
-      player.play();
+            player.play();
-    });
+        });
 
-    proxy(this.$pause, 'click', () => {
+        proxy(this.$pause, 'click', () => {
-      player.pause();
+            player.pause();
-    });
+        });
 
-    art.on('video:playing', () => {
+        art.on('video:playing', () => {
-      setStyle(this.$play, 'display', 'none');
+            setStyle(this.$play, 'display', 'none');
-      setStyle(this.$pause, 'display', 'flex');
+            setStyle(this.$pause, 'display', 'flex');
-    });
+        });
 
-    art.on('video:pause', () => {
+        art.on('video:pause', () => {
-      setStyle(this.$play, 'display', 'flex');
+            setStyle(this.$play, 'display', 'flex');
-      setStyle(this.$pause, 'display', 'none');
+            setStyle(this.$pause, 'display', 'none');
-    });
+        });
-  }
+    }
 }

packages/artplayer/src/controls/progress.js

@@ -1,134 +1,148 @@
 import { append, clamp, secondToTime, setStyle, getStyle } from '../utils';
 
 export default class Progress {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-    this.isDroging = false;
-    this.set = this.set.bind(this);
-  }
-
-  apply(art, $control) {
-    this.art = art;
-    this.$control = $control;
-    const { option: { highlight, theme }, events: { proxy }, player } = art;
-
-    append(
-      $control,
-      `
-        <div class="art-control-progress-inner">
-          <div class="art-progress-loaded"></div>
-          <div class="art-progress-played" style="background: ${theme}"></div>
-          <div class="art-progress-highlight"></div>
-          <div class="art-progress-indicator" style="background: ${theme}"></div>
-          <div class="art-progress-tip art-tip"></div>
-        </div>
-      `
-    );
-
-    this.$loaded = $control.querySelector('.art-progress-loaded');
-    this.$played = $control.querySelector('.art-progress-played');
-    this.$highlight = $control.querySelector('.art-progress-highlight');
-    this.$indicator = $control.querySelector('.art-progress-indicator');
-    this.$tip = $control.querySelector('.art-progress-tip');
-
-    highlight.forEach(item => {
-      const left = clamp(item.time, 0, player.duration) / player.duration * 100;
-      append(this.$highlight, `<span data-text="${item.text}" data-time="${item.time}" style="left: ${left}%"></span>`);
-    });
-
-    this.set('loaded', player.loaded);
-
-    this.art.on('video:progress', () => {
-      this.set('loaded', player.loaded);
-    });
-
-    this.art.on('video:timeupdate', () => {
-      this.set('played', player.played);
-    });
-
-    this.art.on('video:ended', () => {
-      this.set('played', 1);
-    });
-
-    proxy($control, 'mousemove', event => {
-      setStyle(this.$tip, 'display', 'block');
-      if (event.composedPath().indexOf(this.$highlight) > -1) {
-        this.showHighlight(event);
-      } else {
-        this.showTime(event);
-      }
-    });
-
-    proxy($control, 'mouseout', () => {
-      setStyle(this.$tip, 'display', 'none');
-    });
-
-    proxy($control, 'click', event => {
-      if (event.target !== this.$indicator) {
-        const { second, percentage } = this.getPosFromEvent(event);
-        this.set('played', percentage);
-        player.seek(second);
-      }
-    });
-
-    proxy(this.$indicator, 'mousedown', () => {
-      this.isDroging = true;
-    });
-
-    proxy(document, 'mousemove', event => {
-      if (this.isDroging) {
-        const { second, percentage } = this.getPosFromEvent(event);
-        this.$indicator.classList.add('art-show-indicator');
-        this.set('played', percentage);
-        player.seek(second);
-      }
-    });
-
-    proxy(document, 'mouseup', () => {
-      if (this.isDroging) {
         this.isDroging = false;
-        this.$indicator.classList.remove('art-show-indicator');
+        this.set = this.set.bind(this);
-      }
-    });
-  }
-
-  showHighlight(event) {
-    const { text, time } = event.target.dataset;
-    this.$tip.innerHTML = text;
-    const left =
-      Number(time) / this.art.player.duration * this.$control.clientWidth +
-      event.target.clientWidth / 2 -
-      this.$tip.clientWidth / 2;
-    setStyle(this.$tip, 'left', `${left}px`);
-  }
-
-  showTime(event) {
-    const { width, time } = this.getPosFromEvent(event);
-    const tipWidth = this.$tip.clientWidth;
-    this.$tip.innerHTML = time;
-    if (width <= tipWidth / 2) {
-      setStyle(this.$tip, 'left', 0);
-    } else if (width > this.$control.clientWidth - tipWidth / 2) {
-      setStyle(this.$tip, 'left', `${this.$control.clientWidth - tipWidth}px`);
-    } else {
-      setStyle(this.$tip, 'left', `${width - tipWidth / 2}px`);
     }
-  }
 
-  getPosFromEvent(event) {
+    apply(art, $control) {
-    const { player, refs: { $progress } } = this.art;
+        this.art = art;
-    const { left } = $progress.getBoundingClientRect();
+        this.$control = $control;
-    const width = clamp(event.x - left, 0, $progress.clientWidth);
+        const {
-    const second = width / $progress.clientWidth * player.duration;
+            option: { highlight, theme },
-    const time = secondToTime(second);
+            events: { proxy },
-    const percentage = clamp(width / $progress.clientWidth, 0, 1);
+            player,
-    return { second, time, width, percentage };
+        } = art;
-  }
 
-  set(type, percentage) {
+        append(
-    setStyle(this[`$${type}`], 'width', `${percentage * 100}%`);
+            $control,
-    if (type === 'played') {
+            `
-      setStyle(this.$indicator, 'left', `calc(${percentage * 100}% - ${getStyle(this.$indicator, 'width') / 2}px)`);
+              <div class="art-control-progress-inner">
+                <div class="art-progress-loaded"></div>
+                <div class="art-progress-played" style="background: ${theme}"></div>
+                <div class="art-progress-highlight"></div>
+                <div class="art-progress-indicator" style="background: ${theme}"></div>
+                <div class="art-progress-tip art-tip"></div>
+              </div>
+            `,
+        );
+
+        this.$loaded = $control.querySelector('.art-progress-loaded');
+        this.$played = $control.querySelector('.art-progress-played');
+        this.$highlight = $control.querySelector('.art-progress-highlight');
+        this.$indicator = $control.querySelector('.art-progress-indicator');
+        this.$tip = $control.querySelector('.art-progress-tip');
+
+        highlight.forEach(item => {
+            const left = (clamp(item.time, 0, player.duration) / player.duration) * 100;
+            append(
+                this.$highlight,
+                `<span data-text="${item.text}" data-time="${item.time}" style="left: ${left}%"></span>`,
+            );
+        });
+
+        this.set('loaded', player.loaded);
+
+        this.art.on('video:progress', () => {
+            this.set('loaded', player.loaded);
+        });
+
+        this.art.on('video:timeupdate', () => {
+            this.set('played', player.played);
+        });
+
+        this.art.on('video:ended', () => {
+            this.set('played', 1);
+        });
+
+        proxy($control, 'mousemove', event => {
+            setStyle(this.$tip, 'display', 'block');
+            if (event.composedPath().indexOf(this.$highlight) > -1) {
+                this.showHighlight(event);
+            } else {
+                this.showTime(event);
+            }
+        });
+
+        proxy($control, 'mouseout', () => {
+            setStyle(this.$tip, 'display', 'none');
+        });
+
+        proxy($control, 'click', event => {
+            if (event.target !== this.$indicator) {
+                const { second, percentage } = this.getPosFromEvent(event);
+                this.set('played', percentage);
+                player.seek(second);
+            }
+        });
+
+        proxy(this.$indicator, 'mousedown', () => {
+            this.isDroging = true;
+        });
+
+        proxy(document, 'mousemove', event => {
+            if (this.isDroging) {
+                const { second, percentage } = this.getPosFromEvent(event);
+                this.$indicator.classList.add('art-show-indicator');
+                this.set('played', percentage);
+                player.seek(second);
+            }
+        });
+
+        proxy(document, 'mouseup', () => {
+            if (this.isDroging) {
+                this.isDroging = false;
+                this.$indicator.classList.remove('art-show-indicator');
+            }
+        });
+    }
+
+    showHighlight(event) {
+        const { text, time } = event.target.dataset;
+        this.$tip.innerHTML = text;
+        const left =
+            (Number(time) / this.art.player.duration) * this.$control.clientWidth +
+            event.target.clientWidth / 2 -
+            this.$tip.clientWidth / 2;
+        setStyle(this.$tip, 'left', `${left}px`);
+    }
+
+    showTime(event) {
+        const { width, time } = this.getPosFromEvent(event);
+        const tipWidth = this.$tip.clientWidth;
+        this.$tip.innerHTML = time;
+        if (width <= tipWidth / 2) {
+            setStyle(this.$tip, 'left', 0);
+        } else if (width > this.$control.clientWidth - tipWidth / 2) {
+            setStyle(this.$tip, 'left', `${this.$control.clientWidth - tipWidth}px`);
+        } else {
+            setStyle(this.$tip, 'left', `${width - tipWidth / 2}px`);
+        }
+    }
+
+    getPosFromEvent(event) {
+        const {
+            player,
+            refs: { $progress },
+        } = this.art;
+        const { left } = $progress.getBoundingClientRect();
+        const width = clamp(event.x - left, 0, $progress.clientWidth);
+        const second = (width / $progress.clientWidth) * player.duration;
+        const time = secondToTime(second);
+        const percentage = clamp(width / $progress.clientWidth, 0, 1);
+        return { second, time, width, percentage };
+    }
+
+    set(type, percentage) {
+        setStyle(this[`$${type}`], 'width', `${percentage * 100}%`);
+        if (type === 'played') {
+            setStyle(
+                this.$indicator,
+                'left',
+                `calc(${percentage * 100}% - ${getStyle(this.$indicator, 'width') / 2}px)`,
+            );
+        }
     }
-  }
 }

packages/artplayer/src/controls/quality.js

@@ -1,33 +1,43 @@
 import { append } from '../utils';
 
 export default class Quality {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-    this.playIndex = -1;
+        this.playIndex = -1;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { option, events: { proxy, hover }, player } = art;
+        const {
-    const defaultQuality = option.quality.find(item => item.default) || option.quality[0];
+            option,
-    this.playIndex = option.quality.indexOf(defaultQuality);
+            events: { proxy, hover },
-    const $qualityName = append($control, `<div class="art-quality-name">${defaultQuality.name}</div>`);
+            player,
-    const qualityList = option.quality.map((item, index) => `<div class="art-quality-item" data-index="${index}">${item.name}</div>`).join('');
+        } = art;
-    const $qualitys = append($control, `<div class="art-qualitys">${qualityList}</div>`);
+        const defaultQuality = option.quality.find(item => item.default) || option.quality[0];
+        this.playIndex = option.quality.indexOf(defaultQuality);
+        const $qualityName = append($control, `<div class="art-quality-name">${defaultQuality.name}</div>`);
+        const qualityList = option.quality
+            .map((item, index) => `<div class="art-quality-item" data-index="${index}">${item.name}</div>`)
+            .join('');
+        const $qualitys = append($control, `<div class="art-qualitys">${qualityList}</div>`);
 
-    hover($control, () => {
+        hover(
-      $control.classList.add('art-quality-hover');
+            $control,
-    }, () => {
+            () => {
-      $control.classList.remove('art-quality-hover');
+                $control.classList.add('art-quality-hover');
-    });
+            },
+            () => {
+                $control.classList.remove('art-quality-hover');
+            },
+        );
 
-    proxy($qualitys, 'click', event => {
+        proxy($qualitys, 'click', event => {
-      const index = Number(event.target.dataset.index);
+            const index = Number(event.target.dataset.index);
-      const { url, name } = option.quality[index];
+            const { url, name } = option.quality[index];
-      if (url && name && this.playIndex !== index) {
+            if (url && name && this.playIndex !== index) {
-        player.switch(url, name);
+                player.switch(url, name);
-        $qualityName.innerHTML = name;
+                $qualityName.innerHTML = name;
-        this.playIndex = index;
+                this.playIndex = index;
-      }
+            }
-    });
+        });
-  }
+    }
 }

packages/artplayer/src/controls/screenshot.js

@@ -2,16 +2,20 @@ import { append, tooltip } from '../utils';
 import icons from '../icons';
 
 export default class Screenshot {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, i18n, player } = art;
+        const {
-    this.$screenshot = append($control, icons.screenshot);
+            events: { proxy },
-    tooltip(this.$screenshot, i18n.get('Screenshot'));
+            i18n,
-    proxy(this.$screenshot, 'click', () => {
+            player,
-      player.screenshot();
+        } = art;
-    });
+        this.$screenshot = append($control, icons.screenshot);
-  }
+        tooltip(this.$screenshot, i18n.get('Screenshot'));
+        proxy(this.$screenshot, 'click', () => {
+            player.screenshot();
+        });
+    }
 }

packages/artplayer/src/controls/setting.js

@@ -2,27 +2,31 @@ import { append, tooltip, setStyle } from '../utils';
 import icons from '../icons';
 
 export default class Setting {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, i18n, setting } = art;
+        const {
-    this.$setting = append($control, icons.setting);
+            events: { proxy },
-    tooltip(this.$setting, i18n.get('Show setting'));
+            i18n,
+            setting,
+        } = art;
+        this.$setting = append($control, icons.setting);
+        tooltip(this.$setting, i18n.get('Show setting'));
 
-    proxy($control, 'click', () => {
+        proxy($control, 'click', () => {
-      setting.toggle();
+            setting.toggle();
-    });
+        });
 
-    art.on('setting:show', () => {
+        art.on('setting:show', () => {
-      setStyle(this.$setting, 'opacity', '0.8');
+            setStyle(this.$setting, 'opacity', '0.8');
-      tooltip(this.$setting, i18n.get('Hide setting'));
+            tooltip(this.$setting, i18n.get('Hide setting'));
-    });
+        });
 
-    art.on('setting:hide', () => {
+        art.on('setting:hide', () => {
-      setStyle(this.$setting, 'opacity', '1');
+            setStyle(this.$setting, 'opacity', '1');
-      tooltip(this.$setting, i18n.get('Show setting'));
+            tooltip(this.$setting, i18n.get('Show setting'));
-    });
+        });
-  }
+    }
 }

packages/artplayer/src/controls/subtitle.js

@@ -2,27 +2,31 @@ import { append, tooltip, setStyle } from '../utils';
 import icons from '../icons';
 
 export default class Subtitle {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $control) {
+    apply(art, $control) {
-    const { events: { proxy }, i18n, subtitle } = art;
+        const {
-    this.$subtitle = append($control, icons.subtitle);
+            events: { proxy },
-    tooltip(this.$subtitle, i18n.get('Hide subtitle'));
+            i18n,
+            subtitle,
+        } = art;
+        this.$subtitle = append($control, icons.subtitle);
+        tooltip(this.$subtitle, i18n.get('Hide subtitle'));
 
-    proxy($control, 'click', () => {
+        proxy($control, 'click', () => {
-      subtitle.toggle();
+            subtitle.toggle();
-    });
+        });
 
-    art.on('subtitle:show', () => {
+        art.on('subtitle:show', () => {
-      setStyle(this.$subtitle, 'opacity', '1');
+            setStyle(this.$subtitle, 'opacity', '1');
-      tooltip(this.$subtitle, i18n.get('Hide subtitle'));
+            tooltip(this.$subtitle, i18n.get('Hide subtitle'));
-    });
+        });
 
-    art.on('subtitle:hide', () => {
+        art.on('subtitle:hide', () => {
-      setStyle(this.$subtitle, 'opacity', '0.8');
+            setStyle(this.$subtitle, 'opacity', '0.8');
-      tooltip(this.$subtitle, i18n.get('Show subtitle'));
+            tooltip(this.$subtitle, i18n.get('Show subtitle'));
-    });
+        });
-  }
+    }
 }

packages/artplayer/src/controls/thumbnails.js

@@ -1,57 +1,63 @@
 import { errorHandle, setStyle } from '../utils';
 
 export default class Thumbnails {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-    this.loading = false;
+        this.loading = false;
-    this.isLoad = false;
+        this.isLoad = false;
-  }
+    }
-
+
-  apply(art, $control) {
+    apply(art, $control) {
-    this.art = art;
+        this.art = art;
-    errorHandle(art.controls.progress, '\'thumbnails\' control dependent on \'progress\' control');
+        errorHandle(art.controls.progress, "'thumbnails' control dependent on 'progress' control");
-    const { refs: { $progress }, events: { proxy, loadImg } } = art;
+        const {
-    this.$control = $control;
+            refs: { $progress },
-
+            events: { proxy, loadImg },
-    proxy($progress, 'mousemove', event => {
+        } = art;
-      if (!this.loading) {
+        this.$control = $control;
-        this.loading = true;
+
-        loadImg(this.art.option.thumbnails.url).then(() => {
+        proxy($progress, 'mousemove', event => {
-          this.isLoad = true;
+            if (!this.loading) {
-        });
+                this.loading = true;
-      }
+                loadImg(this.art.option.thumbnails.url).then(() => {
-
+                    this.isLoad = true;
-      if (this.isLoad) {
+                });
-        setStyle($control, 'display', 'block');
+            }
-        this.showThumbnails(event);
+
-      }
+            if (this.isLoad) {
-    });
+                setStyle($control, 'display', 'block');
-
+                this.showThumbnails(event);
-    proxy($progress, 'mouseout', () => {
+            }
-      setStyle($control, 'display', 'none');
+        });
-    });
+
-  }
+        proxy($progress, 'mouseout', () => {
-
+            setStyle($control, 'display', 'none');
-  showThumbnails(event) {
+        });
-    const { refs: { $progress }, controls } = this.art;
+    }
-    const { width: posWidth } = controls.progress.getPosFromEvent(event);
+
-    const { url, height, width, number, column } = this.art.option.thumbnails;
+    showThumbnails(event) {
-    const perWidth = $progress.clientWidth / number;
+        const {
-    const perIndex = Math.ceil(posWidth / perWidth);
+            refs: { $progress },
-    let yIndex = Math.ceil(perIndex / column);
+            controls,
-    let xIndex = perIndex % column || column;
+        } = this.art;
-
+        const { width: posWidth } = controls.progress.getPosFromEvent(event);
-    setStyle(this.$control, 'backgroundImage', `url(${url})`);
+        const { url, height, width, number, column } = this.art.option.thumbnails;
-    setStyle(this.$control, 'height', `${height}px`);
+        const perWidth = $progress.clientWidth / number;
-    setStyle(this.$control, 'width', `${width}px`);
+        const perIndex = Math.ceil(posWidth / perWidth);
-    setStyle(this.$control, 'backgroundPosition', `-${--xIndex * width}px -${--yIndex * height}px`);
+        const yIndex = Math.ceil(perIndex / column) - 1;
-
+        const xIndex = perIndex % column || column - 1;
-    if (posWidth <= width / 2) {
+
-      setStyle(this.$control, 'left', 0);
+        setStyle(this.$control, 'backgroundImage', `url(${url})`);
-    } else if (posWidth > $progress.clientWidth - width / 2) {
+        setStyle(this.$control, 'height', `${height}px`);
-      setStyle(this.$control, 'left', `${$progress.clientWidth - width}px`);
+        setStyle(this.$control, 'width', `${width}px`);
-    } else {
+        setStyle(this.$control, 'backgroundPosition', `-${xIndex * width}px -${yIndex * height}px`);
-      setStyle(this.$control, 'left', `${posWidth - width / 2}px`);
+
+        if (posWidth <= width / 2) {
+            setStyle(this.$control, 'left', 0);
+        } else if (posWidth > $progress.clientWidth - width / 2) {
+            setStyle(this.$control, 'left', `${$progress.clientWidth - width}px`);
+        } else {
+            setStyle(this.$control, 'left', `${posWidth - width / 2}px`);
+        }
     }
-  }
 }

packages/artplayer/src/controls/time.js

@@ -1,21 +1,21 @@
 import { secondToTime } from '../utils';
 
 export default class Time {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
-
-  apply(art, $control) {
-    function getTime() {
-      const newTime = `${secondToTime(art.player.currentTime)} / ${secondToTime(art.player.duration)}`;
-      if (newTime !== $control.innerHTML) {
-        $control.innerHTML = newTime;
-      }
     }
 
-    getTime();
+    apply(art, $control) {
-    ['video:loadedmetadata', 'video:timeupdate', 'video:progress'].forEach(event => {
+        function getTime() {
-      art.on(event, getTime);
+            const newTime = `${secondToTime(art.player.currentTime)} / ${secondToTime(art.player.duration)}`;
-    });
+            if (newTime !== $control.innerHTML) {
-  }
+                $control.innerHTML = newTime;
+            }
+        }
+
+        getTime();
+        ['video:loadedmetadata', 'video:timeupdate', 'video:progress'].forEach(event => {
+            art.on(event, getTime);
+        });
+    }
 }

packages/artplayer/src/controls/volume.js

@@ -2,83 +2,93 @@ import { append, clamp, tooltip, setStyle, sleep, getStyle } from '../utils';
 import icons from '../icons';
 
 export default class Volume {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-    this.isDroging = false;
-  }
-
-  apply(art, $control) {
-    const { events: { proxy, hover }, player, i18n, storage } = art;
-    this.$volume = append($control, icons.volume);
-    this.$volumeClose = append($control, icons.volumeClose);
-    this.$volumePanel = append($control, '<div class="art-volume-panel"></div>');
-    this.$volumeHandle = append(this.$volumePanel, '<div class="art-volume-slider-handle"></div>');
-    tooltip(this.$volume, i18n.get('Mute'));
-    setStyle(this.$volumeClose, 'display', 'none');
-
-    art.on('volumeChange', percentage => {
-      if (percentage === 0) {
-        setStyle(this.$volume, 'display', 'none');
-        setStyle(this.$volumeClose, 'display', 'flex');
-      } else {
-        setStyle(this.$volume, 'display', 'flex');
-        setStyle(this.$volumeClose, 'display', 'none');
-      }
-    });
-
-    art.on('video:volumechange', () => {
-      this.setVolumeHandle(player.volume);
-    });
-
-    proxy(this.$volume, 'click', () => {
-      player.volume = 0;
-    });
-
-    proxy(this.$volumeClose, 'click', () => {
-      player.volume = storage.get('volume');
-    });
-
-    hover($control, () => {
-      this.$volumePanel.classList.add('art-volume-panel-hover');
-      sleep(200).then(() => {
-        this.setVolumeHandle(player.volume);
-      });
-    }, () => {
-      this.$volumePanel.classList.remove('art-volume-panel-hover');
-    });
-
-    proxy(this.$volumePanel, 'click', event => {
-      player.volume = this.volumeChangeFromEvent(event);
-    });
-
-    proxy(this.$volumeHandle, 'mousedown', () => {
-      this.isDroging = true;
-    });
-
-    proxy(this.$volumeHandle, 'mousemove', event => {
-      if (this.isDroging) {
-        player.volume = this.volumeChangeFromEvent(event);
-      }
-    });
-
-    proxy(document, 'mouseup', () => {
-      if (this.isDroging) {
         this.isDroging = false;
-      }
+    }
-    });
-  }
 
-  volumeChangeFromEvent(event) {
+    apply(art, $control) {
-    const { left: panelLeft, width: panelWidth } = this.$volumePanel.getBoundingClientRect();
+        const {
-    const { width: handleWidth } = this.$volumeHandle.getBoundingClientRect();
+            events: { proxy, hover },
-    const percentage = clamp(event.x - panelLeft - handleWidth / 2, 0, panelWidth - handleWidth / 2) / (panelWidth - handleWidth);
+            player,
-    return percentage;
+            i18n,
-  }
+            storage,
+        } = art;
+        this.$volume = append($control, icons.volume);
+        this.$volumeClose = append($control, icons.volumeClose);
+        this.$volumePanel = append($control, '<div class="art-volume-panel"></div>');
+        this.$volumeHandle = append(this.$volumePanel, '<div class="art-volume-slider-handle"></div>');
+        tooltip(this.$volume, i18n.get('Mute'));
+        setStyle(this.$volumeClose, 'display', 'none');
 
-  setVolumeHandle(percentage = 0.7) {
+        art.on('volumeChange', percentage => {
-    const panelWidth = getStyle(this.$volumePanel, 'width');
+            if (percentage === 0) {
-    const handleWidth = getStyle(this.$volumeHandle, 'width');
+                setStyle(this.$volume, 'display', 'none');
-    const width = handleWidth / 2 + (panelWidth - handleWidth) * percentage - handleWidth / 2;
+                setStyle(this.$volumeClose, 'display', 'flex');
-    setStyle(this.$volumeHandle, 'left', `${width}px`);
+            } else {
-  }
+                setStyle(this.$volume, 'display', 'flex');
+                setStyle(this.$volumeClose, 'display', 'none');
+            }
+        });
+
+        art.on('video:volumechange', () => {
+            this.setVolumeHandle(player.volume);
+        });
+
+        proxy(this.$volume, 'click', () => {
+            player.volume = 0;
+        });
+
+        proxy(this.$volumeClose, 'click', () => {
+            player.volume = storage.get('volume');
+        });
+
+        hover(
+            $control,
+            () => {
+                this.$volumePanel.classList.add('art-volume-panel-hover');
+                sleep(200).then(() => {
+                    this.setVolumeHandle(player.volume);
+                });
+            },
+            () => {
+                this.$volumePanel.classList.remove('art-volume-panel-hover');
+            },
+        );
+
+        proxy(this.$volumePanel, 'click', event => {
+            player.volume = this.volumeChangeFromEvent(event);
+        });
+
+        proxy(this.$volumeHandle, 'mousedown', () => {
+            this.isDroging = true;
+        });
+
+        proxy(this.$volumeHandle, 'mousemove', event => {
+            if (this.isDroging) {
+                player.volume = this.volumeChangeFromEvent(event);
+            }
+        });
+
+        proxy(document, 'mouseup', () => {
+            if (this.isDroging) {
+                this.isDroging = false;
+            }
+        });
+    }
+
+    volumeChangeFromEvent(event) {
+        const { left: panelLeft, width: panelWidth } = this.$volumePanel.getBoundingClientRect();
+        const { width: handleWidth } = this.$volumeHandle.getBoundingClientRect();
+        const percentage =
+            clamp(event.x - panelLeft - handleWidth / 2, 0, panelWidth - handleWidth / 2) / (panelWidth - handleWidth);
+        return percentage;
+    }
+
+    setVolumeHandle(percentage = 0.7) {
+        const panelWidth = getStyle(this.$volumePanel, 'width');
+        const handleWidth = getStyle(this.$volumeHandle, 'width');
+        const width = handleWidth / 2 + (panelWidth - handleWidth) * percentage - handleWidth / 2;
+        setStyle(this.$volumeHandle, 'left', `${width}px`);
+    }
 }

packages/artplayer/src/events/clickInit.js

@@ -1,11 +1,13 @@
 export default function clickInit(art, events) {
-  const { refs: { $player } } = art;
+    const {
-  events.proxy(document, ['click', 'contextmenu'], event => {
+        refs: { $player },
-    if (event.composedPath().indexOf($player) > -1) {
+    } = art;
-      art.isFocus = true;
+    events.proxy(document, ['click', 'contextmenu'], event => {
-    } else {
+        if (event.composedPath().indexOf($player) > -1) {
-      art.isFocus = false;
+            art.isFocus = true;
-      art.contextmenu.hide();
+        } else {
-    }
+            art.isFocus = false;
-  });
+            art.contextmenu.hide();
+        }
+    });
 }

packages/artplayer/src/events/doubleClickInit.js

@@ -1,7 +1,9 @@
 export default function doubleClickInit(art, events) {
-  const { refs: { $video } } = art;
+    const {
-  events.proxy($video, 'dblclick', () => {
+        refs: { $video },
-    art.player.fullscreenToggle();
+    } = art;
-    art.emit('dblclick');
+    events.proxy($video, 'dblclick', () => {
-  });
+        art.player.fullscreenToggle();
+        art.emit('dblclick');
+    });
 }

packages/artplayer/src/events/hoverInit.js

@@ -1,14 +1,16 @@
 export default function hoverInit(art, events) {
-  const { refs: { $player } } = art;
+    const {
-  events.hover(
+        refs: { $player },
-    $player,
+    } = art;
-    () => {
+    events.hover(
-      $player.classList.add('artplayer-hover');
+        $player,
-      art.emit('hoverenter');
+        () => {
-    },
+            $player.classList.add('artplayer-hover');
-    () => {
+            art.emit('hoverenter');
-      $player.classList.remove('artplayer-hover');
+        },
-      art.emit('hoverleave');
+        () => {
-    }
+            $player.classList.remove('artplayer-hover');
-  );
+            art.emit('hoverleave');
+        },
+    );
 }

packages/artplayer/src/events/index.js

@@ -5,58 +5,60 @@ import resizeInit from './resizeInit';
 import doubleClickInit from './doubleClickInit';
 
 export default class Events {
-  constructor(art) {
+    constructor(art) {
-    this.destroyEvents = [];
+        this.destroyEvents = [];
-    this.proxy = this.proxy.bind(this);
+        this.proxy = this.proxy.bind(this);
-    this.hover = this.hover.bind(this);
+        this.hover = this.hover.bind(this);
-    this.loadImg = this.loadImg.bind(this);
+        this.loadImg = this.loadImg.bind(this);
-    clickInit(art, this);
+        clickInit(art, this);
-    hoverInit(art, this);
+        hoverInit(art, this);
-    mousemoveInit(art, this);
+        mousemoveInit(art, this);
-    resizeInit(art, this);
+        resizeInit(art, this);
-    doubleClickInit(art, this);
+        doubleClickInit(art, this);
-  }
-
-  proxy(target, name, callback, option = {}) {
-    if (Array.isArray(name)) {
-      name.forEach(item => this.proxy(target, item, callback, option));
-      return;
     }
 
-    target.addEventListener(name, callback, option);
+    proxy(target, name, callback, option = {}) {
-    this.destroyEvents.push(() => {
+        if (Array.isArray(name)) {
-      target.removeEventListener(name, callback, option);
+            name.forEach(item => this.proxy(target, item, callback, option));
-    });
+            return;
-  }
+        }
 
-  hover(target, mouseenter, mouseleave) {
+        target.addEventListener(name, callback, option);
-    this.proxy(target, 'mouseenter', mouseenter);
+        this.destroyEvents.push(() => {
-    this.proxy(target, 'mouseleave', mouseleave);
+            target.removeEventListener(name, callback, option);
-  }
+        });
+    }
 
-  loadImg(img) {
+    hover(target, mouseenter, mouseleave) {
-    return new Promise((resolve, reject) => {
+        this.proxy(target, 'mouseenter', mouseenter);
-      let image;
+        this.proxy(target, 'mouseleave', mouseleave);
+    }
 
-      if (img instanceof HTMLImageElement) {
+    loadImg(img) {
-        image = img;
+        return new Promise((resolve, reject) => {
-      } else if (typeof img === 'string') {
+            let image;
-        image = new Image();
-        image.src = img;
-      } else {
-        return reject(img);
-      }
 
-      if (image.complete) {
+            if (img instanceof HTMLImageElement) {
-        return resolve(image);
+                image = img;
-      }
+            } else if (typeof img === 'string') {
+                image = new Image();
+                image.src = img;
+            } else {
+                return reject(img);
+            }
 
-      this.proxy(image, 'load', () => resolve(image));
+            if (image.complete) {
-      this.proxy(image, 'error', () => reject(image));
+                return resolve(image);
-    });
+            }
-  }
 
-  destroy() {
+            this.proxy(image, 'load', () => resolve(image));
-    this.destroyEvents.forEach(event => event());
+            this.proxy(image, 'error', () => reject(image));
-  }
+
+            return img;
+        });
+    }
+
+    destroy() {
+        this.destroyEvents.forEach(event => event());
+    }
 }

packages/artplayer/src/events/mousemoveInit.js

@@ -1,26 +1,28 @@
 import { debounce } from '../utils';
 
 export default function mousemoveInitInit(art, events) {
-  const { refs: { $player } } = art;
+    const {
+        refs: { $player },
+    } = art;
 
-  const autoHide = debounce(() => {
+    const autoHide = debounce(() => {
-    $player.classList.add('artplayer-hide-cursor');
+        $player.classList.add('artplayer-hide-cursor');
-    $player.classList.remove('artplayer-hover');
+        $player.classList.remove('artplayer-hover');
-    art.controls.hide();
+        art.controls.hide();
-  }, 5000);
+    }, 5000);
 
-  art.on('hoverleave', () => {
+    art.on('hoverleave', () => {
-    if (art.isPlaying) {
+        if (art.isPlaying) {
-      autoHide();
+            autoHide();
-    }
+        }
-  });
+    });
 
-  events.proxy($player, 'mousemove', () => {
+    events.proxy($player, 'mousemove', () => {
-    autoHide.clearTimeout();
+        autoHide.clearTimeout();
-    $player.classList.remove('artplayer-hide-cursor');
+        $player.classList.remove('artplayer-hide-cursor');
-    art.controls.show();
+        art.controls.show();
-    if (!art.player.pipState && art.isPlaying) {
+        if (!art.player.pipState && art.isPlaying) {
-      autoHide();
+            autoHide();
-    }
+        }
-  });
+    });
 }

packages/artplayer/src/events/resizeInit.js

@@ -1,27 +1,26 @@
-import { sleep } from '../utils';
 import { ResizeObserver } from 'resize-observer';
+import { sleep } from '../utils';
 
 export default function resizeInit(art, events) {
-  const { option, refs: { $player } } = art;
+    const {
-  const resizeObserver = new ResizeObserver(() => {
+        option,
-    sleep().then(() => {
+        refs: { $player },
-      if (option.autoSize) {
+    } = art;
-        if (
+    const resizeObserver = new ResizeObserver(() => {
-          !art.player.fullscreenState &&
+        sleep().then(() => {
-          !art.player.fullscreenWebState &&
+            if (option.autoSize) {
-          !art.player.pipState
+                if (!art.player.fullscreenState && !art.player.fullscreenWebState && !art.player.pipState) {
-        ) {
+                    art.player.autoSize();
-          art.player.autoSize();
+                } else {
-        } else {
+                    art.player.autoSizeRemove();
-          art.player.autoSizeRemove();
+                }
-        }
+            }
-      }
+            art.player.aspectRatioReset();
-      art.player.aspectRatioReset();
+            art.emit('resize', $player);
-      art.emit('resize', $player);
+        });
+    });
+    resizeObserver.observe($player);
+    events.destroyEvents.push(() => {
+        resizeObserver.unobserve($player);
     });
-  });
-  resizeObserver.observe($player);
-  events.destroyEvents.push(() => {
-    resizeObserver.unobserve($player);
-  });
 }

packages/artplayer/src/hotkey.js

@@ -1,52 +1,50 @@
 export default class Hotkey {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    if (this.art.option.hotkey) {
+        if (this.art.option.hotkey) {
-      this.art.on('firstCanplay', () => {
+            this.art.on('firstCanplay', () => {
-        this.init();
+                this.init();
-      });
+            });
-    }
-  }
-
-  init() {
-    const { player, events: { proxy } } = this.art;
-    proxy(window, 'keydown', event => {
-      if (this.art.isFocus) {
-        const tag = document.activeElement.tagName.toUpperCase();
-        const editable = document.activeElement.getAttribute('contenteditable');
-        if (
-          tag !== 'INPUT' &&
-          tag !== 'TEXTAREA' &&
-          editable !== '' &&
-          editable !== 'true'
-        ) {
-          this.art.emit('hotkey', event);
-          switch (event.keyCode) {
-            case 39:
-              event.preventDefault();
-              player.seek(player.currentTime + 10);
-              break;
-            case 37:
-              event.preventDefault();
-              player.seek(player.currentTime - 10);
-              break;
-            case 38:
-              event.preventDefault();
-              player.volume += 0.05;
-              break;
-            case 40:
-              event.preventDefault();
-              player.volume -= 0.05;
-              break;
-            case 32:
-              event.preventDefault();
-              player.toggle();
-              break;
-            default:
-              break;
-          }
         }
-      }
+    }
-    });
+
-  }
+    init() {
+        const {
+            player,
+            events: { proxy },
+        } = this.art;
+        proxy(window, 'keydown', event => {
+            if (this.art.isFocus) {
+                const tag = document.activeElement.tagName.toUpperCase();
+                const editable = document.activeElement.getAttribute('contenteditable');
+                if (tag !== 'INPUT' && tag !== 'TEXTAREA' && editable !== '' && editable !== 'true') {
+                    this.art.emit('hotkey', event);
+                    switch (event.keyCode) {
+                        case 39:
+                            event.preventDefault();
+                            player.seek(player.currentTime + 10);
+                            break;
+                        case 37:
+                            event.preventDefault();
+                            player.seek(player.currentTime - 10);
+                            break;
+                        case 38:
+                            event.preventDefault();
+                            player.volume += 0.05;
+                            break;
+                        case 40:
+                            event.preventDefault();
+                            player.volume -= 0.05;
+                            break;
+                        case 32:
+                            event.preventDefault();
+                            player.toggle();
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+        });
+    }
 }

packages/artplayer/src/i18n.js

@@ -1,88 +1,88 @@
 let i18nMap = {
-  'zh-cn': {
+    'zh-cn': {
-    'About author': '关于作者',
+        'About author': '关于作者',
-    'Video info': '视频统计信息',
+        'Video info': '视频统计信息',
-    'Close': '关闭',
+        Close: '关闭',
-    'Video load failed': '视频加载失败',
+        'Video load failed': '视频加载失败',
-    'Volume': '音量',
+        Volume: '音量',
-    'Play': '播放',
+        Play: '播放',
-    'Pause': '暂停',
+        Pause: '暂停',
-    'Rate': '速度',
+        Rate: '速度',
-    'Mute': '静音',
+        Mute: '静音',
-    'Flip': '视频翻转',
+        Flip: '视频翻转',
-    'Horizontal': '水平',
+        Horizontal: '水平',
-    'Vertical': '垂直',
+        Vertical: '垂直',
-    'Reconnect': '重新连接',
+        Reconnect: '重新连接',
-    'Hide subtitle': '隐藏字幕',
+        'Hide subtitle': '隐藏字幕',
-    'Show subtitle': '显示字幕',
+        'Show subtitle': '显示字幕',
-    'Hide danmu': '隐藏弹幕',
+        'Hide danmu': '隐藏弹幕',
-    'Show danmu': '显示弹幕',
+        'Show danmu': '显示弹幕',
-    'Show setting': '显示设置',
+        'Show setting': '显示设置',
-    'Hide setting': '隐藏设置',
+        'Hide setting': '隐藏设置',
-    'Screenshot': '截图',
+        Screenshot: '截图',
-    'Play speed': '播放速度',
+        'Play speed': '播放速度',
-    'Aspect ratio': '画面比例',
+        'Aspect ratio': '画面比例',
-    'Default': '默认',
+        Default: '默认',
-    'Normal': '正常',
+        Normal: '正常',
-    'Switch video': '切换',
+        'Switch video': '切换',
-    'Switch subtitle': '切换字幕',
+        'Switch subtitle': '切换字幕',
-    'Fullscreen': '全屏',
+        Fullscreen: '全屏',
-    'Exit fullscreen': '退出全屏',
+        'Exit fullscreen': '退出全屏',
-    'Web fullscreen': '网页全屏',
+        'Web fullscreen': '网页全屏',
-    'Exit web fullscreen': '退出网页全屏',
+        'Exit web fullscreen': '退出网页全屏',
-    'Mini player': '迷你播放器'
+        'Mini player': '迷你播放器',
-  },
+    },
-  'zh-tw': {
+    'zh-tw': {
-    'About author': '關於作者',
+        'About author': '關於作者',
-    'Video info': '影片統計訊息',
+        'Video info': '影片統計訊息',
-    'Close': '關閉',
+        Close: '關閉',
-    'Video load failed': '影片載入失敗',
+        'Video load failed': '影片載入失敗',
-    'Volume': '音量',
+        Volume: '音量',
-    'Play': '播放',
+        Play: '播放',
-    'Pause': '暫停',
+        Pause: '暫停',
-    'Rate': '速度',
+        Rate: '速度',
-    'Mute': '靜音',
+        Mute: '靜音',
-    'Flip': '影片翻轉',
+        Flip: '影片翻轉',
-    'Horizontal': '水平',
+        Horizontal: '水平',
-    'Vertical': '垂直',
+        Vertical: '垂直',
-    'Reconnect': '重新連接',
+        Reconnect: '重新連接',
-    'Hide subtitle': '隱藏字幕',
+        'Hide subtitle': '隱藏字幕',
-    'Show subtitle': '顯示字幕',
+        'Show subtitle': '顯示字幕',
-    'Show setting': '顯示设置',
+        'Show setting': '顯示设置',
-    'Hide setting': '隱藏设置',
+        'Hide setting': '隱藏设置',
-    'Hide danmu': '隱藏彈幕',
+        'Hide danmu': '隱藏彈幕',
-    'Show danmu': '顯示彈幕',
+        'Show danmu': '顯示彈幕',
-    'Screenshot': '截圖',
+        Screenshot: '截圖',
-    'Play speed': '播放速度',
+        'Play speed': '播放速度',
-    'Aspect ratio': '畫面比例',
+        'Aspect ratio': '畫面比例',
-    'Default': '默認',
+        Default: '默認',
-    'Normal': '正常',
+        Normal: '正常',
-    'Switch video': '切換',
+        'Switch video': '切換',
-    'Switch subtitle': '切換字幕',
+        'Switch subtitle': '切換字幕',
-    'Fullscreen': '全屏',
+        Fullscreen: '全屏',
-    'Exit fullscreen': '退出全屏',
+        'Exit fullscreen': '退出全屏',
-    'Web fullscreen': '網頁全屏',
+        'Web fullscreen': '網頁全屏',
-    'Exit web fullscreen': '退出網頁全屏',
+        'Exit web fullscreen': '退出網頁全屏',
-    'Mini player': '迷你播放器'
+        'Mini player': '迷你播放器',
-  }
+    },
 };
 
 export default class I18n {
-  constructor({ option }) {
+    constructor({ option }) {
-    this.option = option;
+        this.option = option;
-    this.init();
+        this.init();
-  }
+    }
 
-  init() {
+    init() {
-    this.language = i18nMap[this.option.lang.toLowerCase()] || {};
+        this.language = i18nMap[this.option.lang.toLowerCase()] || {};
-  }
+    }
 
-  get(key) {
+    get(key) {
-    return this.language[key] || key;
+        return this.language[key] || key;
-  }
+    }
 
-  update(callback) {
+    update(callback) {
-    i18nMap = callback(i18nMap);
+        i18nMap = callback(i18nMap);
-    this.init();
+        this.init();
-  }
+    }
 }

packages/artplayer/src/icons/index.js

@@ -14,28 +14,28 @@ import prev from './prev.svg';
 import next from './next.svg';
 
 function creatDomFromSvg(map) {
-  const result = {};
+    const result = {};
-  Object.keys(map).forEach(name => {
+    Object.keys(map).forEach(name => {
-    const tmp = document.createElement('div');
+        const tmp = document.createElement('div');
-    tmp.innerHTML = `<i class="art-icon art-icon-${name}">${map[name]}</i>`;
+        tmp.innerHTML = `<i class="art-icon art-icon-${name}">${map[name]}</i>`;
-    [result[name]] = tmp.childNodes;
+        [result[name]] = tmp.childNodes;
-  });
+    });
-  return result;
+    return result;
 }
 
 export default creatDomFromSvg({
-  loading,
+    loading,
-  playBig,
+    playBig,
-  play,
+    play,
-  pause,
+    pause,
-  volume,
+    volume,
-  volumeClose,
+    volumeClose,
-  subtitle,
+    subtitle,
-  screenshot,
+    screenshot,
-  setting,
+    setting,
-  fullscreen,
+    fullscreen,
-  fullscreenWeb,
+    fullscreenWeb,
-  pip,
+    pip,
-  prev,
+    prev,
-  next
+    next,
 });

packages/artplayer/src/index.js

@@ -1,10 +1,11 @@
 import './style';
 import 'balloon-css/balloon.min.css';
-import * as utils from './utils';
+import Emitter from 'tiny-emitter';
 import optionValidator from 'option-validator';
+import merge from 'deepmerge';
+import * as utils from './utils';
 import scheme from './scheme';
 import config from './config';
-import Emitter from 'tiny-emitter';
 import Template from './template';
 import I18n from './i18n';
 import Player from './player';
@@ -23,136 +24,133 @@ import Storage from './storage';
 
 let id = 0;
 class Artplayer extends Emitter {
-  constructor(option) {
+    constructor(option) {
-    super();
+        super();
-    this.option = utils.deepMerge({}, Artplayer.DEFAULTS, option);
+        this.option = merge(Artplayer.DEFAULTS, option);
-    optionValidator(this.option, scheme);
+        optionValidator(this.option, scheme);
-    this.init();
+        this.init();
-  }
-
-  static get version() {
-    return '__VERSION__';
-  }
-
-  static get config() {
-    return config;
-  }
-
-  static get utils() {
-    return utils;
-  }
-
-  static get DEFAULTS() {
-    return {
-      container: '#artplayer',
-      url: '',
-      poster: '',
-      title: '',
-      type: '',
-      mimeCodec: '',
-      theme: '#f00',
-      volume: 0.7,
-      autoplay: false,
-      autoSize: false,
-      loop: false,
-      playbackRate: false,
-      aspectRatio: false,
-      screenshot: false,
-      setting: false,
-      hotkey: true,
-      pip: false,
-      mutex: true,
-      fullscreen: false,
-      fullscreenWeb: false,
-      layers: [],
-      contextmenu: [],
-      quality: [],
-      controls: [],
-      highlight: [],
-      thumbnails: {
-        url: '',
-        number: 60,
-        width: 160,
-        height: 90,
-        column: 10
-      },
-      subtitle: {
-        url: '',
-        style: {}
-      },
-      moreVideoAttr: {
-        controls: false,
-        preload: 'auto'
-      },
-      lang: navigator.language.toLowerCase()
-    };
-  }
-
-  static use(plugin) {
-    const installedPlugins = this.plugins || (this.plugins = []);
-    if (installedPlugins.indexOf === -1) {
-      installedPlugins.push(plugin);
-      const args = Array.from(arguments).slice(1);
-      args.unshift(this);
-      plugin.apply(null, args);
-      this.prototype.emit('use', plugin);
-    }
-    return this;
-  }
-
-  init() {
-    this.isFocus = false;
-    this.isPlaying = false;
-    this.refs = {};
-
-    if (this.option.container instanceof Element) {
-      this.refs.$container = this.option.container;
-    } else {
-      this.refs.$container = document.querySelector(this.option.container);
     }
 
-    if (
+    static get version() {
-      Artplayer.instances.some(
+        return '__VERSION__';
-        art => art.refs.$container === this.refs.$container
-      )
-    ) {
-      utils.errorHandle(false, 'Cannot mount multiple instances on the same dom element');
     }
 
-    this.template = new Template(this);
+    static get config() {
-    this.storage = new Storage(this);
+        return config;
-    this.i18n = new I18n(this);
+    }
-    this.notice = new Notice(this);
+
-    this.events = new Events(this);
+    static get utils() {
-    this.player = new Player(this);
+        return utils;
-    this.layers = new Layers(this);
+    }
-    this.controls = new Controls(this);
+
-    this.contextmenu = new Contextmenu(this);
+    static get DEFAULTS() {
-    this.subtitle = new Subtitle(this);
+        return {
-    this.info = new Info(this);
+            container: '#artplayer',
-    this.loading = new Loading(this);
+            url: '',
-    this.hotkey = new Hotkey(this);
+            poster: '',
-    this.mask = new Mask(this);
+            title: '',
-    this.setting = new Setting(this);
+            type: '',
-
+            mimeCodec: '',
-    this.id = id++;
+            theme: '#f00',
-    Artplayer.instances.push(this);
+            volume: 0.7,
-  }
+            autoplay: false,
-
+            autoSize: false,
-  destroy(removeHtml = false) {
+            loop: false,
-    this.events.destroy();
+            playbackRate: false,
-    Artplayer.instances.splice(Artplayer.instances.indexOf(this), 1);
+            aspectRatio: false,
-    if (removeHtml) {
+            screenshot: false,
-      this.refs.$container.innerHTML = '';
+            setting: false,
-    } else {
+            hotkey: true,
-      this.refs.$player.classList.add('artplayer-destroy');
+            pip: false,
+            mutex: true,
+            fullscreen: false,
+            fullscreenWeb: false,
+            layers: [],
+            contextmenu: [],
+            quality: [],
+            controls: [],
+            highlight: [],
+            thumbnails: {
+                url: '',
+                number: 60,
+                width: 160,
+                height: 90,
+                column: 10,
+            },
+            subtitle: {
+                url: '',
+                style: {},
+            },
+            moreVideoAttr: {
+                controls: false,
+                preload: 'auto',
+            },
+            lang: navigator.language.toLowerCase(),
+        };
+    }
+
+    static use(...args) {
+        const plugin = args[0];
+        const installedPlugins = this.plugins || (this.plugins = []);
+        if (installedPlugins.indexOf === -1) {
+            installedPlugins.push(plugin);
+            args.unshift(this);
+            plugin(...args.slice(1));
+            this.prototype.emit('use', plugin);
+        }
+        return this;
+    }
+
+    init() {
+        this.isFocus = false;
+        this.isPlaying = false;
+        this.refs = {};
+
+        if (this.option.container instanceof Element) {
+            this.refs.$container = this.option.container;
+        } else {
+            this.refs.$container = document.querySelector(this.option.container);
+        }
+
+        if (Artplayer.instances.some(art => art.refs.$container === this.refs.$container)) {
+            utils.errorHandle(false, 'Cannot mount multiple instances on the same dom element');
+        }
+
+        this.template = new Template(this);
+        this.storage = new Storage(this);
+        this.i18n = new I18n(this);
+        this.notice = new Notice(this);
+        this.events = new Events(this);
+        this.player = new Player(this);
+        this.layers = new Layers(this);
+        this.controls = new Controls(this);
+        this.contextmenu = new Contextmenu(this);
+        this.subtitle = new Subtitle(this);
+        this.info = new Info(this);
+        this.loading = new Loading(this);
+        this.hotkey = new Hotkey(this);
+        this.mask = new Mask(this);
+        this.setting = new Setting(this);
+
+        id += 1;
+        this.id = id;
+        Artplayer.instances.push(this);
+    }
+
+    destroy(removeHtml = false) {
+        this.events.destroy();
+        Artplayer.instances.splice(Artplayer.instances.indexOf(this), 1);
+        if (removeHtml) {
+            this.refs.$container.innerHTML = '';
+        } else {
+            this.refs.$player.classList.add('artplayer-destroy');
+        }
+        this.emit('destroy');
     }
-    this.emit('destroy');
-  }
 }
 
 Object.defineProperty(Artplayer, 'instances', {
-  value: []
+    value: [],
 });
 
 window.Artplayer = Artplayer;

packages/artplayer/src/info.js

@@ -1,141 +1,146 @@
 import { append, setStyle } from './utils';
 
 export default class Info {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    this.init();
+        this.init();
-  }
-
-  init() {
-    const { refs: { $infoClose, $infoPanel }, events: { proxy } } = this.art;
-    proxy($infoClose, 'click', () => {
-      this.hide();
-    });
-    this.art.on('switch', () => {
-      if ($infoPanel.innerHTML) {
-        this.getHeader();
-      }
-    });
-  }
-
-  show() {
-    const { $info, $infoPanel } = this.art.refs;
-    setStyle($info, 'display', 'block');
-    if (!$infoPanel.innerHTML) {
-      append($infoPanel, this.creatInfo());
-      this.getHeader();
     }
-    clearTimeout(this.timer);
-    this.loop();
-    this.art.emit('info:show', $info);
-  }
 
-  creatInfo() {
+    init() {
-    const infoHtml = [];
+        const {
+            refs: { $infoClose, $infoPanel },
+            events: { proxy },
+        } = this.art;
+        proxy($infoClose, 'click', () => {
+            this.hide();
+        });
+        this.art.on('switch', () => {
+            if ($infoPanel.innerHTML) {
+                this.getHeader();
+            }
+        });
+    }
 
-    infoHtml.push(`
+    show() {
-      <div class="art-info-item ">
+        const { $info, $infoPanel } = this.art.refs;
-        <div class="art-info-title">Player version:</div>
+        setStyle($info, 'display', 'block');
-        <div class="art-info-content">__VERSION__</div>
+        if (!$infoPanel.innerHTML) {
-      </div>
+            append($infoPanel, this.creatInfo());
-    `);
+            this.getHeader();
+        }
+        clearTimeout(this.timer);
+        this.loop();
+        this.art.emit('info:show', $info);
+    }
 
-    infoHtml.push(`
+    creatInfo() {
-      <div class="art-info-item">
+        const infoHtml = [];
-        <div class="art-info-title">Video url:</div>
-        <div class="art-info-content" data-video="currentSrc"></div>
-      </div>
-    `);
 
-    infoHtml.push(`
+        infoHtml.push(`
-      <div class="art-info-item">
+          <div class="art-info-item ">
-        <div class="art-info-title">Video type:</div>
+            <div class="art-info-title">Player version:</div>
-        <div class="art-info-content" data-head="Content-Type"></div>
+            <div class="art-info-content">__VERSION__</div>
-      </div>
+          </div>
-    `);
+        `);
 
-    infoHtml.push(`
+        infoHtml.push(`
-      <div class="art-info-item">
+          <div class="art-info-item">
-        <div class="art-info-title">Video size:</div>
+            <div class="art-info-title">Video url:</div>
-        <div class="art-info-content" data-head="Content-length"></div>
+            <div class="art-info-content" data-video="currentSrc"></div>
-      </div>
+          </div>
-    `);
+        `);
 
-    infoHtml.push(`
+        infoHtml.push(`
-      <div class="art-info-item">
+          <div class="art-info-item">
-        <div class="art-info-title">Video volume:</div>
+            <div class="art-info-title">Video type:</div>
-        <div class="art-info-content" data-video="volume"></div>
+            <div class="art-info-content" data-head="Content-Type"></div>
-      </div>
+          </div>
-    `);
+        `);
 
-    infoHtml.push(`
+        infoHtml.push(`
-      <div class="art-info-item">
+          <div class="art-info-item">
-        <div class="art-info-title">Video time:</div>
+            <div class="art-info-title">Video size:</div>
-        <div class="art-info-content" data-video="currentTime"></div>
+            <div class="art-info-content" data-head="Content-length"></div>
-      </div>
+          </div>
-    `);
+        `);
 
-    infoHtml.push(`
+        infoHtml.push(`
-      <div class="art-info-item">
+          <div class="art-info-item">
-        <div class="art-info-title">Video duration:</div>
+            <div class="art-info-title">Video volume:</div>
-        <div class="art-info-content" data-video="duration"></div>
+            <div class="art-info-content" data-video="volume"></div>
-      </div>
+          </div>
-    `);
+        `);
 
-    infoHtml.push(`
+        infoHtml.push(`
-      <div class="art-info-item">
+          <div class="art-info-item">
-        <div class="art-info-title">Video resolution:</div>
+            <div class="art-info-title">Video time:</div>
-        <div class="art-info-content">
+            <div class="art-info-content" data-video="currentTime"></div>
-          <span data-video="videoWidth"></span> x <span data-video="videoHeight"></span>
+          </div>
-        </div>
+        `);
-      </div>
-    `);
 
-    return infoHtml.join('');
+        infoHtml.push(`
-  }
+          <div class="art-info-item">
+            <div class="art-info-title">Video duration:</div>
+            <div class="art-info-content" data-video="duration"></div>
+          </div>
+        `);
 
-  getHeader() {
+        infoHtml.push(`
-    const { $infoPanel, $video } = this.art.refs;
+          <div class="art-info-item">
-    const url = $video.src;
+            <div class="art-info-title">Video resolution:</div>
-    const types = Array.from($infoPanel.querySelectorAll('[data-head]'));
+            <div class="art-info-content">
-    types.forEach(item => {
+              <span data-video="videoWidth"></span> x <span data-video="videoHeight"></span>
-      item.innerHTML = 'loading...';
+            </div>
-    });
+          </div>
-    fetch(url, {
+        `);
-      method: 'HEAD'
-    }).then(data => {
-      types.forEach(item => {
-        const value = data.headers.get(item.dataset.head);
-        item.innerHTML = value !== undefined ? value : 'unknown';
-      });
-    }).catch(() => {
-      types.forEach(item => {
-        item.innerHTML = 'unknown';
-      });
-    });
-  }
 
-  readInfo() {
+        return infoHtml.join('');
-    const { $infoPanel, $video } = this.art.refs;
+    }
-    const types = Array.from($infoPanel.querySelectorAll('[data-video]'));
-    types.forEach(item => {
-      const value = $video[item.dataset.video];
-      item.innerHTML = value !== undefined ? value : 'unknown';
-    });
-  }
 
-  loop() {
+    getHeader() {
-    this.readInfo();
+        const { $infoPanel, $video } = this.art.refs;
-    this.timer = setTimeout(() => {
+        const url = $video.src;
-      this.readInfo();
+        const types = Array.from($infoPanel.querySelectorAll('[data-head]'));
-      this.loop();
+        types.forEach(item => {
-    }, 1000);
+            item.innerHTML = 'loading...';
-  }
+        });
+        fetch(url, {
+            method: 'HEAD',
+        })
+            .then(data => {
+                types.forEach(item => {
+                    const value = data.headers.get(item.dataset.head);
+                    item.innerHTML = value !== undefined ? value : 'unknown';
+                });
+            })
+            .catch(() => {
+                types.forEach(item => {
+                    item.innerHTML = 'unknown';
+                });
+            });
+    }
 
-  hide() {
+    readInfo() {
-    const { $info } = this.art.refs;
+        const { $infoPanel, $video } = this.art.refs;
-    setStyle($info, 'display', 'none');
+        const types = Array.from($infoPanel.querySelectorAll('[data-video]'));
-    clearTimeout(this.timer);
+        types.forEach(item => {
-    this.art.emit('info:hide', $info);
+            const value = $video[item.dataset.video];
-  }
+            item.innerHTML = value !== undefined ? value : 'unknown';
+        });
+    }
+
+    loop() {
+        this.readInfo();
+        this.timer = setTimeout(() => {
+            this.readInfo();
+            this.loop();
+        }, 1000);
+    }
+
+    hide() {
+        const { $info } = this.art.refs;
+        setStyle($info, 'display', 'none');
+        clearTimeout(this.timer);
+        this.art.emit('info:hide', $info);
+    }
 }

packages/artplayer/src/layers.js

@@ -2,49 +2,56 @@ import { append, setStyles, setStyle, insertByIndex } from './utils';
 
 let id = 0;
 export default class Layers {
-  constructor(art) {
+    constructor(art) {
-    id = 0;
+        id = 0;
-    this.art = art;
+        this.art = art;
-    this.add = this.add.bind(this);
+        this.add = this.add.bind(this);
-    this.art.option.layers.forEach(item => {
+        this.art.option.layers.forEach(item => {
-      this.add(item);
+            this.add(item);
-    });
-  }
-
-  add(item, callback) {
-    const layer = typeof item === 'function' ? item(this.art) : item;
-    if (!layer.disable) {
-      id++;
-      const { refs: { $layers }, events: { proxy } } = this.art;
-      const name = layer.name || `layer${id}`;
-      const $layer = document.createElement('div');
-      $layer.classList.value = `art-layer art-layer-${name}`;
-      setStyles($layer, layer.style || {});
-      append($layer, layer.html);
-      if (layer.click) {
-        proxy($layer, 'click', event => {
-          event.preventDefault();
-          layer.click.call(this, event);
-          this.art.emit('layers:click', $layer);
         });
-      }
-      insertByIndex($layers, $layer, layer.index || id);
-      this[name] = $layer;
-      item.callback && item.callback($layer);
-      callback && callback($layer);
-      this.art.emit('layers:add', $layer);
     }
-  }
 
-  show() {
+    add(item, callback) {
-    const { $layers } = this.art.refs;
+        const layer = typeof item === 'function' ? item(this.art) : item;
-    setStyle($layers, 'display', 'block');
+        if (!layer.disable) {
-    this.art.emit('layers:show', $layers);
+            id += 1;
-  }
+            const {
+                refs: { $layers },
+                events: { proxy },
+            } = this.art;
+            const name = layer.name || `layer${id}`;
+            const $layer = document.createElement('div');
+            $layer.classList.value = `art-layer art-layer-${name}`;
+            setStyles($layer, layer.style || {});
+            append($layer, layer.html);
+            if (layer.click) {
+                proxy($layer, 'click', event => {
+                    event.preventDefault();
+                    layer.click.call(this, event);
+                    this.art.emit('layers:click', $layer);
+                });
+            }
+            insertByIndex($layers, $layer, layer.index || id);
+            this[name] = $layer;
+            if (item.callback) {
+                item.callback($layer);
+            }
+            if (callback) {
+                callback($layer);
+            }
+            this.art.emit('layers:add', $layer);
+        }
+    }
 
-  hide() {
+    show() {
-    const { $layers } = this.art.refs;
+        const { $layers } = this.art.refs;
-    setStyle($layers, 'display', 'none');
+        setStyle($layers, 'display', 'block');
-    this.art.emit('layers:hide', $layers);
+        this.art.emit('layers:show', $layers);
-  }
+    }
+
+    hide() {
+        const { $layers } = this.art.refs;
+        setStyle($layers, 'display', 'none');
+        this.art.emit('layers:hide', $layers);
+    }
 }

packages/artplayer/src/loading.js

@@ -2,21 +2,23 @@ import icons from './icons';
 import { append, setStyle } from './utils';
 
 export default class Loading {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    const { refs: { $loading } } = art;
+        const {
-    append($loading, icons.loading);
+            refs: { $loading },
-  }
+        } = art;
+        append($loading, icons.loading);
+    }
 
-  hide() {
+    hide() {
-    const { $loading } = this.art.refs;
+        const { $loading } = this.art.refs;
-    setStyle($loading, 'display', 'none');
+        setStyle($loading, 'display', 'none');
-    this.art.emit('loading:hide', $loading);
+        this.art.emit('loading:hide', $loading);
-  }
+    }
 
-  show() {
+    show() {
-    const { $loading } = this.art.refs;
+        const { $loading } = this.art.refs;
-    setStyle($loading, 'display', 'flex');
+        setStyle($loading, 'display', 'flex');
-    this.art.emit('loading:show', $loading);
+        this.art.emit('loading:show', $loading);
-  }
+    }
 }

packages/artplayer/src/mask.js

@@ -2,21 +2,23 @@ import icons from './icons';
 import { append, setStyle } from './utils';
 
 export default class Mask {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    const { refs: { $mask } } = art;
+        const {
-    append($mask, icons.playBig);
+            refs: { $mask },
-  }
+        } = art;
+        append($mask, icons.playBig);
+    }
 
-  show() {
+    show() {
-    const { $mask } = this.art.refs;
+        const { $mask } = this.art.refs;
-    setStyle($mask, 'display', 'flex');
+        setStyle($mask, 'display', 'flex');
-    this.art.emit('mask:show', $mask);
+        this.art.emit('mask:show', $mask);
-  }
+    }
 
-  hide() {
+    hide() {
-    const { $mask } = this.art.refs;
+        const { $mask } = this.art.refs;
-    setStyle($mask, 'display', 'none');
+        setStyle($mask, 'display', 'none');
-    this.art.emit('mask:show', $mask);
+        this.art.emit('mask:show', $mask);
-  }
+    }
 }

packages/artplayer/src/mse.js

@@ -1,121 +1,123 @@
-import ArtPlayerError from './utils/ArtPlayerError';
+import { ArtPlayerError, errorHandle, getExt } from './utils';
-import { errorHandle, getExt } from './utils';
 import config from './config';
 
 export default class Mse {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    this.setMimeCodec();
+        this.setMimeCodec();
-    this.init();
+        this.init();
-    this.eventBind();
+        this.eventBind();
-    this.eventStart();
+        this.eventStart();
-    this.repeat = 0;
+        this.repeat = 0;
-    this.maxRepeat = 5;
+        this.maxRepeat = 5;
-  }
-
-  setMimeCodec() {
-    const { option } = this.art;
-    if (!option.type) {
-      const type = getExt(option.url);
-      errorHandle(
-        Object.keys(config.mimeCodec).includes(type),
-        `Can't find video's type '${type}' from '${option.url}'`
-      );
-      option.type = type;
     }
 
-    if (!option.mimeCodec) {
+    setMimeCodec() {
-      const mimeCodec = config.mimeCodec[option.type];
+        const { option } = this.art;
-      errorHandle(
+        if (!option.type) {
-        mimeCodec,
+            const type = getExt(option.url);
-        `Can't find video's mimeCodec from ${option.type}`
+            errorHandle(
-      );
+                Object.keys(config.mimeCodec).includes(type),
-      option.mimeCodec = mimeCodec;
+                `Can't find video's type '${type}' from '${option.url}'`,
-    }
+            );
-  }
+            option.type = type;
-
-  init() {
-    const {
-      option,
-      refs: { $video }
-    } = this.art;
-    errorHandle(
-      MediaSource.isTypeSupported(option.mimeCodec),
-      `Unsupported MIME type or codec: ${option.mimeCodec}`
-    );
-    this.mediaSource = new MediaSource();
-    $video.src = URL.createObjectURL(this.mediaSource);
-    this.art.events.destroyEvents.push(() => {
-      URL.revokeObjectURL($video.src);
-    });
-  }
-
-  eventBind() {
-    const { proxy } = this.art.events;
-    const { mediaSource, sourceBufferList } = config.mse;
-
-    mediaSource.events.forEach(eventName => {
-      proxy(this.mediaSource, eventName, event => {
-        this.art.emit(`mediaSource:${event.type}`, event);
-      });
-    });
-
-    sourceBufferList.events.forEach(eventName => {
-      proxy(this.mediaSource.sourceBuffers, eventName, event => {
-        this.art.emit(`sourceBuffers:${event.type}`, event);
-      });
-      proxy(this.mediaSource.activeSourceBuffers, eventName, event => {
-        this.art.emit(`activeSourceBuffers:${event.type}`, event);
-      });
-    });
-  }
-
-  eventStart() {
-    const { option } = this.art;
-    const { proxy } = this.art.events;
-    const { sourceBuffer } = config.mse;
-
-    this.art.on('mediaSource:sourceopen', () => {
-      this.sourceBuffer = this.mediaSource.addSourceBuffer(option.mimeCodec);
-      sourceBuffer.events.forEach(eventName => {
-        proxy(this.sourceBuffer, eventName, event => {
-          this.art.emit(`sourceBuffer:${event.type}`, event);
-        });
-      });
-    });
-
-    this.art.on('sourceBuffer:updateend', () => {
-      this.mediaSource.endOfStream();
-    });
-
-    this.fetchUrl();
-  }
-
-  fetchUrl() {
-    const { option: { url }, notice, i18n, loading } = this.art;
-    this.art.emit('player:fetch:start', url);
-    this.request(url)
-      .then(response => {
-        this.sourceBuffer.appendBuffer(response);
-        this.art.emit('player:fetch:success', url);
-      })
-      .catch(err => {
-        if (this.repeat++ < this.maxRepeat) {
-          this.fetchUrl();
-        } else {
-          notice.show(i18n.get('Video load failed'));
-          console.warn(err);
-          loading.hide();
-          this.art.emit('player:fetch:failure', url);
         }
-      });
-  }
 
-  request(url) {
+        if (!option.mimeCodec) {
-    return fetch(url)
+            const mimeCodec = config.mimeCodec[option.type];
-      .then(response => response.arrayBuffer())
+            errorHandle(mimeCodec, `Can't find video's mimeCodec from ${option.type}`);
-      .catch(err => {
+            option.mimeCodec = mimeCodec;
-        throw new ArtPlayerError(err.message);
+        }
-      });
+    }
-  }
+
+    init() {
+        const {
+            option,
+            refs: { $video },
+        } = this.art;
+        errorHandle(
+            MediaSource.isTypeSupported(option.mimeCodec),
+            `Unsupported MIME type or codec: ${option.mimeCodec}`,
+        );
+        this.mediaSource = new MediaSource();
+        $video.src = URL.createObjectURL(this.mediaSource);
+        this.art.events.destroyEvents.push(() => {
+            URL.revokeObjectURL($video.src);
+        });
+    }
+
+    eventBind() {
+        const { proxy } = this.art.events;
+        const { mediaSource, sourceBufferList } = config.mse;
+
+        mediaSource.events.forEach(eventName => {
+            proxy(this.mediaSource, eventName, event => {
+                this.art.emit(`mediaSource:${event.type}`, event);
+            });
+        });
+
+        sourceBufferList.events.forEach(eventName => {
+            proxy(this.mediaSource.sourceBuffers, eventName, event => {
+                this.art.emit(`sourceBuffers:${event.type}`, event);
+            });
+            proxy(this.mediaSource.activeSourceBuffers, eventName, event => {
+                this.art.emit(`activeSourceBuffers:${event.type}`, event);
+            });
+        });
+    }
+
+    eventStart() {
+        const { option } = this.art;
+        const { proxy } = this.art.events;
+        const { sourceBuffer } = config.mse;
+
+        this.art.on('mediaSource:sourceopen', () => {
+            this.sourceBuffer = this.mediaSource.addSourceBuffer(option.mimeCodec);
+            sourceBuffer.events.forEach(eventName => {
+                proxy(this.sourceBuffer, eventName, event => {
+                    this.art.emit(`sourceBuffer:${event.type}`, event);
+                });
+            });
+        });
+
+        this.art.on('sourceBuffer:updateend', () => {
+            this.mediaSource.endOfStream();
+        });
+
+        this.fetchUrl();
+    }
+
+    fetchUrl() {
+        const {
+            option: { url },
+            notice,
+            i18n,
+            loading,
+        } = this.art;
+        this.art.emit('player:fetch:start', url);
+        this.request(url)
+            .then(response => {
+                this.sourceBuffer.appendBuffer(response);
+                this.art.emit('player:fetch:success', url);
+            })
+            .catch(err => {
+                this.repeat += 1;
+                if (this.repeat < this.maxRepeat) {
+                    this.fetchUrl();
+                } else {
+                    notice.show(i18n.get('Video load failed'));
+                    console.warn(err);
+                    loading.hide();
+                    this.art.emit('player:fetch:failure', url);
+                }
+            });
+    }
+
+    request(url) {
+        return fetch(url)
+            .then(response => response.arrayBuffer())
+            .catch(err => {
+                throw new ArtPlayerError(err.message);
+            });
+    }
 }

packages/artplayer/src/notice.js

@@ -1,27 +1,27 @@
 import { setStyle } from './utils';
 
 export default class Notice {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    this.timer = null;
+        this.timer = null;
-  }
-
-  show(msg, autoHide = true, time = 1000) {
-    const { $notice, $noticeInner } = this.art.refs;
-    setStyle($notice, 'display', 'block');
-    $noticeInner.innerHTML = msg instanceof Error ? msg.message.trim() : msg;
-    if (autoHide) {
-      clearTimeout(this.timer);
-      this.timer = setTimeout(() => {
-        this.hide();
-      }, time);
     }
-    this.art.emit('notice:show', $notice);
-  }
 
-  hide() {
+    show(msg, autoHide = true, time = 1000) {
-    const { $notice } = this.art.refs;
+        const { $notice, $noticeInner } = this.art.refs;
-    setStyle($notice, 'display', 'none');
+        setStyle($notice, 'display', 'block');
-    this.art.emit('notice:hide', $notice);
+        $noticeInner.innerHTML = msg instanceof Error ? msg.message.trim() : msg;
-  }
+        if (autoHide) {
+            clearTimeout(this.timer);
+            this.timer = setTimeout(() => {
+                this.hide();
+            }, time);
+        }
+        this.art.emit('notice:show', $notice);
+    }
+
+    hide() {
+        const { $notice } = this.art.refs;
+        setStyle($notice, 'display', 'none');
+        this.art.emit('notice:hide', $notice);
+    }
 }

packages/artplayer/src/player/aspectRatioMix.js

@@ -1,63 +1,67 @@
 import { setStyle } from '../utils';
 
 export default function aspectRatioMix(art, player) {
-  const { refs: { $video, $player }, i18n, notice } = art;
+    const {
+        refs: { $video, $player },
+        i18n,
+        notice,
+    } = art;
 
-  Object.defineProperty(player, 'aspectRatioState', {
+    Object.defineProperty(player, 'aspectRatioState', {
-    get: () => $player.dataset.aspectRatio
+        get: () => $player.dataset.aspectRatio,
-  });
+    });
 
-  Object.defineProperty(player, 'aspectRatio', {
+    Object.defineProperty(player, 'aspectRatio', {
-    value: ratio => {
+        value: ratio => {
-      const ratioName = ratio.length === 2 ? `${ratio[0]}:${ratio[1]}` : i18n.get('Default');
+            const ratioName = ratio.length === 2 ? `${ratio[0]}:${ratio[1]}` : i18n.get('Default');
 
-      if (ratio.length === 2) {
+            if (ratio.length === 2) {
-        const { videoWidth, videoHeight } = $video;
+                const { videoWidth, videoHeight } = $video;
-        const { clientWidth, clientHeight } = $player;
+                const { clientWidth, clientHeight } = $player;
-        const videoRatio = videoWidth / videoHeight;
+                const videoRatio = videoWidth / videoHeight;
-        const setupRatio = Number(ratio[0]) / Number(ratio[1]);
+                const setupRatio = Number(ratio[0]) / Number(ratio[1]);
 
-        if (videoRatio > setupRatio) {
+                if (videoRatio > setupRatio) {
-          const percentage = setupRatio * videoHeight / videoWidth;
+                    const percentage = (setupRatio * videoHeight) / videoWidth;
-          setStyle($video, 'width', `${percentage * 100}%`);
+                    setStyle($video, 'width', `${percentage * 100}%`);
-          setStyle($video, 'height', '100%');
+                    setStyle($video, 'height', '100%');
-          setStyle($video, 'padding', `0 ${(clientWidth - clientWidth * percentage) / 2}px`);
+                    setStyle($video, 'padding', `0 ${(clientWidth - clientWidth * percentage) / 2}px`);
-        } else {
+                } else {
-          const percentage = videoWidth / setupRatio / videoHeight;
+                    const percentage = videoWidth / setupRatio / videoHeight;
-          setStyle($video, 'width', '100%');
+                    setStyle($video, 'width', '100%');
-          setStyle($video, 'height', `${percentage * 100}%`);
+                    setStyle($video, 'height', `${percentage * 100}%`);
-          setStyle($video, 'padding', `${(clientHeight - clientHeight * percentage) / 2}px 0`);
+                    setStyle($video, 'padding', `${(clientHeight - clientHeight * percentage) / 2}px 0`);
-        }
+                }
 
-        $player.dataset.aspectRatio = ratioName;
+                $player.dataset.aspectRatio = ratioName;
-      } else {
+            } else {
-        player.aspectRatioRemove();
+                player.aspectRatioRemove();
-      }
+            }
 
-      notice.show(`${i18n.get('Aspect ratio')}: ${ratioName}`);
+            notice.show(`${i18n.get('Aspect ratio')}: ${ratioName}`);
-      art.emit('aspectRatioChange', ratio);
+            art.emit('aspectRatioChange', ratio);
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'aspectRatioRemove', {
+    Object.defineProperty(player, 'aspectRatioRemove', {
-    value: () => {
+        value: () => {
-      if (player.aspectRatioState) {
+            if (player.aspectRatioState) {
-        setStyle($video, 'width', null);
+                setStyle($video, 'width', null);
-        setStyle($video, 'height', null);
+                setStyle($video, 'height', null);
-        setStyle($video, 'padding', null);
+                setStyle($video, 'padding', null);
-        delete $player.dataset.aspectRatio;
+                delete $player.dataset.aspectRatio;
-        art.emit('aspectRatioRemove');
+                art.emit('aspectRatioRemove');
-      }
+            }
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'aspectRatioReset', {
+    Object.defineProperty(player, 'aspectRatioReset', {
-    value: () => {
+        value: () => {
-      const { aspectRatio } = $player.dataset;
+            const { aspectRatio } = $player.dataset;
-      if (aspectRatio) {
+            if (aspectRatio) {
-        player.aspectRatio(aspectRatio.split(':'));
+                player.aspectRatio(aspectRatio.split(':'));
-        art.emit('aspectRatioReset');
+                art.emit('aspectRatioReset');
-      }
+            }
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/attrInit.js

@@ -1,25 +1,28 @@
 import { clamp, sleep } from '../utils';
 
 export default function attrInit(art, player) {
-  const { option, refs: { $video } } = art;
+    const {
-  Object.keys(option.moreVideoAttr).forEach(key => {
+        option,
-    $video[key] = option.moreVideoAttr[key];
+        refs: { $video },
-  });
+    } = art;
+    Object.keys(option.moreVideoAttr).forEach(key => {
+        $video[key] = option.moreVideoAttr[key];
+    });
 
-  if (option.volume) {
+    if (option.volume) {
-    $video.volume = clamp(option.volume, 0, 1);
+        $video.volume = clamp(option.volume, 0, 1);
-  }
+    }
 
-  if (option.poster) {
+    if (option.poster) {
-    $video.poster = option.poster;
+        $video.poster = option.poster;
-  }
+    }
 
-  if (option.autoplay) {
+    if (option.autoplay) {
-    $video.autoplay = option.autoplay;
+        $video.autoplay = option.autoplay;
-  }
+    }
 
-  sleep().then(() => {
+    sleep().then(() => {
-    art.emit('beforeMountUrl', option.url);
+        art.emit('beforeMountUrl', option.url);
-    $video.src = player.mountUrl(option.url);
+        $video.src = player.mountUrl(option.url);
-  });
+    });
 }

packages/artplayer/src/player/autoSizeMix.js

@@ -1,38 +1,40 @@
 import { setStyle } from '../utils';
 
 export default function resizeMix(art, player) {
-  const { refs: { $container, $player, $video } } = art;
+    const {
+        refs: { $container, $player, $video },
+    } = art;
 
-  Object.defineProperty(player, 'autoSizeState', {
+    Object.defineProperty(player, 'autoSizeState', {
-    get: () => $container.classList.contains('artplayer-auto-size')
+        get: () => $container.classList.contains('artplayer-auto-size'),
-  });
+    });
 
-  Object.defineProperty(player, 'autoSize', {
+    Object.defineProperty(player, 'autoSize', {
-    value: () => {
+        value: () => {
-      const { videoWidth, videoHeight } = $video;
+            const { videoWidth, videoHeight } = $video;
-      const { width, height } = $container.getBoundingClientRect();
+            const { width, height } = $container.getBoundingClientRect();
-      const videoRatio = videoWidth / videoHeight;
+            const videoRatio = videoWidth / videoHeight;
-      const containerRatio = width / height;
+            const containerRatio = width / height;
-      $container.classList.add('artplayer-auto-size');
+            $container.classList.add('artplayer-auto-size');
-      if (containerRatio > videoRatio) {
+            if (containerRatio > videoRatio) {
-        const percentage = height * videoRatio / width * 100;
+                const percentage = ((height * videoRatio) / width) * 100;
-        setStyle($player, 'width', `${percentage}%`);
+                setStyle($player, 'width', `${percentage}%`);
-        setStyle($player, 'height', '100%');
+                setStyle($player, 'height', '100%');
-      } else {
+            } else {
-        const percentage = width / videoRatio / height * 100;
+                const percentage = (width / videoRatio / height) * 100;
-        setStyle($player, 'width', '100%');
+                setStyle($player, 'width', '100%');
-        setStyle($player, 'height', `${percentage}%`);
+                setStyle($player, 'height', `${percentage}%`);
-      }
+            }
-      art.emit('autoSizeChange');
+            art.emit('autoSizeChange');
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'autoSizeRemove', {
+    Object.defineProperty(player, 'autoSizeRemove', {
-    value: () => {
+        value: () => {
-      $container.classList.remove('artplayer-auto-size');
+            $container.classList.remove('artplayer-auto-size');
-      setStyle($player, 'width', null);
+            setStyle($player, 'width', null);
-      setStyle($player, 'height', null);
+            setStyle($player, 'height', null);
-      art.emit('autoSizeRemove');
+            art.emit('autoSizeRemove');
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/currentTimeMix.js

@@ -1,8 +1,8 @@
 export default function currentTimeMix(art, player) {
-  Object.defineProperty(player, 'currentTime', {
+    Object.defineProperty(player, 'currentTime', {
-    get: () => art.refs.$video.currentTime || 0,
+        get: () => art.refs.$video.currentTime || 0,
-    set: currentTime => {
+        set: currentTime => {
-      art.refs.$video.currentTime = currentTime;
+            art.refs.$video.currentTime = currentTime;
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/durationMix.js

@@ -1,5 +1,5 @@
 export default function durationMix(art, player) {
-  Object.defineProperty(player, 'duration', {
+    Object.defineProperty(player, 'duration', {
-    get: () => art.refs.$video.duration || 0
+        get: () => art.refs.$video.duration || 0,
-  });
+    });
 }

packages/artplayer/src/player/eventInit.js

@@ -2,97 +2,103 @@ import config from '../config';
 import { sleep } from '../utils';
 
 export default function eventInit(art, player) {
-  const { option, events: { proxy }, refs: { $player, $video }, i18n, notice } = art;
+    const {
-  let firstCanplay = false;
+        option,
-  let reconnectTime = 0;
+        events: { proxy },
-  const maxReconnectTime = 5;
+        refs: { $player, $video },
+        i18n,
+        notice,
+    } = art;
+    let firstCanplay = false;
+    let reconnectTime = 0;
+    const maxReconnectTime = 5;
 
-  proxy($video, 'click', () => {
+    proxy($video, 'click', () => {
-    player.toggle();
+        player.toggle();
-  });
+    });
-
+
-  art.on('video:loadstart', () => {
+    art.on('video:loadstart', () => {
-    art.loading.show();
+        art.loading.show();
-  });
+    });
-
+
-  art.on('video:loadedmetadata', () => {
+    art.on('video:loadedmetadata', () => {
-    if (option.autoSize) {
+        if (option.autoSize) {
-      player.autoSize();
+            player.autoSize();
-    }
+        }
-  });
+    });
-
+
-  art.on('video:loadeddata', () => {
+    art.on('video:loadeddata', () => {
-    art.loading.hide();
+        art.loading.hide();
-  });
+    });
-
+
-  art.on('video:waiting', () => {
+    art.on('video:waiting', () => {
-    art.loading.show();
+        art.loading.show();
-  });
+    });
-
+
-  art.on('video:seeking', () => {
+    art.on('video:seeking', () => {
-    art.loading.show();
+        art.loading.show();
-  });
+    });
-
+
-  art.on('video:canplay', () => {
+    art.on('video:canplay', () => {
-    reconnectTime = 0;
+        reconnectTime = 0;
-    if (!firstCanplay) {
+        if (!firstCanplay) {
-      firstCanplay = true;
+            firstCanplay = true;
-      art.emit('firstCanplay');
+            art.emit('firstCanplay');
-    }
+        }
-
+
-    art.controls.show();
+        art.controls.show();
-    art.mask.show();
+        art.mask.show();
-    art.loading.hide();
+        art.loading.hide();
-    if (option.autoplay) {
+        if (option.autoplay) {
-      player.play();
+            player.play();
-    }
+        }
-  });
+    });
-
+
-  art.on('video:playing', () => {
+    art.on('video:playing', () => {
-    art.isPlaying = true;
+        art.isPlaying = true;
-    art.controls.hide();
+        art.controls.hide();
-    art.mask.hide();
+        art.mask.hide();
-  });
+    });
-
+
-  art.on('video:pause', () => {
+    art.on('video:pause', () => {
-    art.isPlaying = false;
+        art.isPlaying = false;
-    art.controls.show();
+        art.controls.show();
-    art.mask.show();
+        art.mask.show();
-  });
+    });
-
+
-  art.on('video:ended', () => {
+    art.on('video:ended', () => {
-    art.isPlaying = false;
+        art.isPlaying = false;
-    art.controls.show();
+        art.controls.show();
-    art.mask.show();
+        art.mask.show();
-    if (option.loop) {
+        if (option.loop) {
-      player.seek(0);
+            player.seek(0);
-      player.play();
+            player.play();
-    }
+        }
-  });
+    });
-
+
-  art.on('video:error', () => {
+    art.on('video:error', () => {
-    if (reconnectTime < maxReconnectTime) {
+        if (reconnectTime < maxReconnectTime) {
-      sleep(1000).then(() => {
+            sleep(1000).then(() => {
-        reconnectTime++;
+                reconnectTime += 1;
-        art.emit('beforeMountUrl', option.url);
+                art.emit('beforeMountUrl', option.url);
-        $video.src = player.mountUrl(option.url);
+                $video.src = player.mountUrl(option.url);
-        notice.show(`${i18n.get('Reconnect')}: ${reconnectTime}`);
+                notice.show(`${i18n.get('Reconnect')}: ${reconnectTime}`);
-      });
+            });
-    } else {
+        } else {
-      art.isPlaying = false;
+            art.isPlaying = false;
-      art.loading.hide();
+            art.loading.hide();
-      art.controls.hide();
+            art.controls.hide();
-      $player.classList.add('artplayer-error');
+            $player.classList.add('artplayer-error');
-      sleep(1000).then(() => {
+            sleep(1000).then(() => {
-        notice.show(i18n.get('Video load failed'), false);
+                notice.show(i18n.get('Video load failed'), false);
-        art.destroy();
+                art.destroy();
-      });
+            });
-    }
+        }
-  });
+    });
-
+
-  config.video.events.forEach(eventName => {
+    config.video.events.forEach(eventName => {
-    proxy($video, eventName, event => {
+        proxy($video, eventName, event => {
-      art.emit(`video:${event.type}`, event);
+            art.emit(`video:${event.type}`, event);
+        });
     });
-  });
 }

packages/artplayer/src/player/flipMix.js

@@ -1,23 +1,26 @@
 import { errorHandle } from '../utils';
 
 export default function flipMix(art, player) {
-  Object.defineProperty(player, 'flipState', {
+    Object.defineProperty(player, 'flipState', {
-    get: () => art.refs.$player.dataset.flip
+        get: () => art.refs.$player.dataset.flip,
-  });
+    });
 
-  Object.defineProperty(player, 'flip', {
+    Object.defineProperty(player, 'flip', {
-    value: flip => {
+        value: flip => {
-      const flipList = ['normal', 'horizontal', 'vertical'];
+            const flipList = ['normal', 'horizontal', 'vertical'];
-      errorHandle(flipList.includes(flip), `The 'angle' need to be one of '[normal, horizontal, vertical]', but got ${flip}`);
+            errorHandle(
-      art.refs.$player.dataset.flip = flip;
+                flipList.includes(flip),
-      art.emit('flipChange', flip);
+                `The 'angle' need to be one of '[normal, horizontal, vertical]', but got ${flip}`,
-    }
+            );
-  });
+            art.refs.$player.dataset.flip = flip;
+            art.emit('flipChange', flip);
+        },
+    });
 
-  Object.defineProperty(player, 'flipRemove', {
+    Object.defineProperty(player, 'flipRemove', {
-    value: () => {
+        value: () => {
-      delete art.refs.$player.dataset.flip;
+            delete art.refs.$player.dataset.flip;
-      art.emit('flipRemove');
+            art.emit('flipRemove');
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/fullscreenMix.js

@@ -1,56 +1,60 @@
 import screenfull from 'screenfull';
 
 export default function fullscreenMix(art, player) {
-  const { notice, events: { destroyEvents }, refs: { $player } } = art;
+    const {
+        notice,
+        events: { destroyEvents },
+        refs: { $player },
+    } = art;
 
-  const screenfullChange = () => {
+    const screenfullChange = () => {
-    art.emit('fullscreen', screenfull.isFullscreen);
+        art.emit('fullscreen', screenfull.isFullscreen);
-  };
+    };
 
-  const screenfullError = () => {
+    const screenfullError = () => {
-    notice.show('Your browser does not seem to support full screen functionality.');
+        notice.show('Your browser does not seem to support full screen functionality.');
-  };
+    };
 
-  screenfull.on('change', screenfullChange);
+    screenfull.on('change', screenfullChange);
-  screenfull.on('error', screenfullError);
+    screenfull.on('error', screenfullError);
-  destroyEvents.push(() => {
+    destroyEvents.push(() => {
-    screenfull.off('change', screenfullChange);
+        screenfull.off('change', screenfullChange);
-    screenfull.off('error', screenfullError);
+        screenfull.off('error', screenfullError);
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenState', {
+    Object.defineProperty(player, 'fullscreenState', {
-    get: () => screenfull.isFullscreen
+        get: () => screenfull.isFullscreen,
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenEnabled', {
+    Object.defineProperty(player, 'fullscreenEnabled', {
-    value: () => {
+        value: () => {
-      if (player.fullscreenWebState) {
+            if (player.fullscreenWebState) {
-        player.fullscreenWebExit();
+                player.fullscreenWebExit();
-      }
+            }
-      $player.classList.add('artplayer-fullscreen');
+            $player.classList.add('artplayer-fullscreen');
-      screenfull.request($player);
+            screenfull.request($player);
-      art.emit('fullscreen:enabled');
+            art.emit('fullscreen:enabled');
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenExit', {
+    Object.defineProperty(player, 'fullscreenExit', {
-    value: () => {
+        value: () => {
-      if (player.fullscreenState) {
+            if (player.fullscreenState) {
-        player.fullscreenWebExit();
+                player.fullscreenWebExit();
-        $player.classList.remove('artplayer-fullscreen');
+                $player.classList.remove('artplayer-fullscreen');
-        screenfull.exit();
+                screenfull.exit();
-        art.emit('fullscreen:exit');
+                art.emit('fullscreen:exit');
-      }
+            }
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenToggle', {
+    Object.defineProperty(player, 'fullscreenToggle', {
-    value: () => {
+        value: () => {
-      if (player.fullscreenState) {
+            if (player.fullscreenState) {
-        player.fullscreenExit();
+                player.fullscreenExit();
-      } else {
+            } else {
-        player.fullscreenEnabled();
+                player.fullscreenEnabled();
-      }
+            }
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/fullscreenWebMix.js

@@ -1,37 +1,39 @@
 export default function fullscreenWebMix(art, player) {
-  const { refs: { $player } } = art;
+    const {
+        refs: { $player },
+    } = art;
 
-  Object.defineProperty(player, 'fullscreenWebState', {
+    Object.defineProperty(player, 'fullscreenWebState', {
-    get: () => $player.classList.contains('artplayer-web-fullscreen')
+        get: () => $player.classList.contains('artplayer-web-fullscreen'),
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenWebEnabled', {
+    Object.defineProperty(player, 'fullscreenWebEnabled', {
-    value: () => {
+        value: () => {
-      if (player.fullscreenState) {
+            if (player.fullscreenState) {
-        player.fullscreenExit();
+                player.fullscreenExit();
-      }
+            }
-      $player.classList.add('artplayer-web-fullscreen');
+            $player.classList.add('artplayer-web-fullscreen');
-      art.emit('fullscreenWeb:enabled');
+            art.emit('fullscreenWeb:enabled');
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenWebExit', {
+    Object.defineProperty(player, 'fullscreenWebExit', {
-    value: () => {
+        value: () => {
-      if (player.fullscreenWebState) {
+            if (player.fullscreenWebState) {
-        player.fullscreenExit();
+                player.fullscreenExit();
-        $player.classList.remove('artplayer-web-fullscreen');
+                $player.classList.remove('artplayer-web-fullscreen');
-        art.emit('fullscreenWeb:exit');
+                art.emit('fullscreenWeb:exit');
-      }
+            }
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'fullscreenWebToggle', {
+    Object.defineProperty(player, 'fullscreenWebToggle', {
-    value: () => {
+        value: () => {
-      if (player.fullscreenWebState) {
+            if (player.fullscreenWebState) {
-        player.fullscreenWebExit();
+                player.fullscreenWebExit();
-      } else {
+            } else {
-        player.fullscreenWebEnabled();
+                player.fullscreenWebEnabled();
-      }
+            }
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/index.js

@@ -21,27 +21,27 @@ import autoSizeMix from './autoSizeMix';
 import flipMix from './flipMix';
 
 export default class Player {
-  constructor(art) {
+    constructor(art) {
-    mountUrlMix(art, this);
+        mountUrlMix(art, this);
-    eventInit(art, this);
+        eventInit(art, this);
-    attrInit(art, this);
+        attrInit(art, this);
-    playMix(art, this);
+        playMix(art, this);
-    pauseMin(art, this);
+        pauseMin(art, this);
-    toggleMix(art, this);
+        toggleMix(art, this);
-    seekMix(art, this);
+        seekMix(art, this);
-    volumeMix(art, this);
+        volumeMix(art, this);
-    currentTimeMix(art, this);
+        currentTimeMix(art, this);
-    durationMix(art, this);
+        durationMix(art, this);
-    switchMix(art, this);
+        switchMix(art, this);
-    playbackRateMix(art, this);
+        playbackRateMix(art, this);
-    aspectRatioMix(art, this);
+        aspectRatioMix(art, this);
-    screenshotMix(art, this);
+        screenshotMix(art, this);
-    fullscreenMix(art, this);
+        fullscreenMix(art, this);
-    fullscreenWebMix(art, this);
+        fullscreenWebMix(art, this);
-    pipMix(art, this);
+        pipMix(art, this);
-    loadedMix(art, this);
+        loadedMix(art, this);
-    playedMix(art, this);
+        playedMix(art, this);
-    autoSizeMix(art, this);
+        autoSizeMix(art, this);
-    flipMix(art, this);
+        flipMix(art, this);
-  }
+    }
 }

packages/artplayer/src/player/loadedMix.js

@@ -1,9 +1,8 @@
 export default function seekMix(art, player) {
-  Object.defineProperty(player, 'loaded', {
+    Object.defineProperty(player, 'loaded', {
-    get: () =>
+        get: () =>
-      art.refs.$video.buffered.length
+            art.refs.$video.buffered.length
-        ? art.refs.$video.buffered.end(art.refs.$video.buffered.length - 1) /
+                ? art.refs.$video.buffered.end(art.refs.$video.buffered.length - 1) / art.refs.$video.duration
-          art.refs.$video.duration
+                : 0,
-        : 0
+    });
-  });
 }

packages/artplayer/src/player/mountUrlMix.js

@@ -1,6 +1,6 @@
 export default function mountUrlMix(art, player) {
-  Object.defineProperty(player, 'mountUrl', {
+    Object.defineProperty(player, 'mountUrl', {
-    writable: true,
+        writable: true,
-    value: url => url
+        value: url => url,
-  });
+    });
 }

packages/artplayer/src/player/pauseMin.js

@@ -1,11 +1,15 @@
 export default function pauseMin(art, player) {
-  const { refs: { $video }, i18n, notice } = art;
+    const {
+        refs: { $video },
+        i18n,
+        notice,
+    } = art;
 
-  Object.defineProperty(player, 'pause', {
+    Object.defineProperty(player, 'pause', {
-    value: () => {
+        value: () => {
-      $video.pause();
+            $video.pause();
-      notice.show(i18n.get('Pause'));
+            notice.show(i18n.get('Pause'));
-      art.emit('pause');
+            art.emit('pause');
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/pipMix.js

@@ -2,137 +2,137 @@ import Draggabilly from 'draggabilly';
 import { setStyle, append } from '../utils';
 
 function nativePip(art, player) {
-  const {
+    const {
-    notice,
+        notice,
-    refs: { $video },
+        refs: { $video },
-    events: { proxy }
+        events: { proxy },
-  } = art;
+    } = art;
 
-  $video.disablePictureInPicture = false;
+    $video.disablePictureInPicture = false;
 
-  Object.defineProperty(player, 'pipState', {
+    Object.defineProperty(player, 'pipState', {
-    get: () => document.pictureInPictureElement
+        get: () => document.pictureInPictureElement,
-  });
+    });
 
-  Object.defineProperty(player, 'pipEnabled', {
+    Object.defineProperty(player, 'pipEnabled', {
-    value: () => {
+        value: () => {
-      $video.requestPictureInPicture().catch(error => {
+            $video.requestPictureInPicture().catch(error => {
-        notice.show(error, true, 3000);
+                notice.show(error, true, 3000);
-        console.warn(error);
+                console.warn(error);
-      });
+            });
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'pipExit', {
+    Object.defineProperty(player, 'pipExit', {
-    value: () => {
+        value: () => {
-      document.exitPictureInPicture().catch(error => {
+            document.exitPictureInPicture().catch(error => {
-        notice.show(error, true, 3000);
+                notice.show(error, true, 3000);
-        console.warn(error);
+                console.warn(error);
-      });
+            });
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'pipToggle', {
+    Object.defineProperty(player, 'pipToggle', {
-    value: () => {
+        value: () => {
-      if (player.pipState) {
+            if (player.pipState) {
-        player.pipExit();
+                player.pipExit();
-      } else {
+            } else {
-        player.pipEnabled();
+                player.pipEnabled();
-      }
+            }
-    }
+        },
-  });
+    });
 
-  proxy($video, 'enterpictureinpicture', () => {
+    proxy($video, 'enterpictureinpicture', () => {
-    art.emit('pipEnabled');
+        art.emit('pipEnabled');
-  });
+    });
 
-  proxy($video, 'leavepictureinpicture', () => {
+    proxy($video, 'leavepictureinpicture', () => {
-    art.emit('pipExit');
+        art.emit('pipExit');
-    if (art.isPlaying) {
+        if (art.isPlaying) {
-      player.play();
+            player.play();
-    }
+        }
-  });
+    });
 }
 
 function customPip(art, player) {
-  const {
+    const {
-    option,
+        option,
-    i18n,
+        i18n,
-    refs: { $player, $pipClose, $pipTitle },
+        refs: { $player, $pipClose, $pipTitle },
-    events: { destroyEvents, proxy }
+        events: { destroyEvents, proxy },
-  } = art;
+    } = art;
-  let cachePos = null;
+    let cachePos = null;
-  let draggie = null;
+    let draggie = null;
 
-  Object.defineProperty(player, 'pipState', {
+    Object.defineProperty(player, 'pipState', {
-    get: () => $player.classList.contains('artplayer-pip')
+        get: () => $player.classList.contains('artplayer-pip'),
-  });
+    });
 
-  Object.defineProperty(player, 'pipEnabled', {
+    Object.defineProperty(player, 'pipEnabled', {
-    value: () => {
+        value: () => {
-      if (player.autoSizeState) {
+            if (player.autoSizeState) {
-        player.autoSizeRemove();
+                player.autoSizeRemove();
-      }
+            }
 
-      if (!draggie) {
+            if (!draggie) {
-        draggie = new Draggabilly($player, {
+                draggie = new Draggabilly($player, {
-          handle: '.artplayer-pip-header'
+                    handle: '.artplayer-pip-header',
-        });
+                });
 
-        append($pipTitle, option.title || i18n.get('Mini player'));
+                append($pipTitle, option.title || i18n.get('Mini player'));
 
-        proxy($pipClose, 'click', () => {
+                proxy($pipClose, 'click', () => {
-          player.pipExit();
+                    player.pipExit();
-        });
+                });
 
-        destroyEvents.push(() => {
+                destroyEvents.push(() => {
-          draggie.destroy();
+                    draggie.destroy();
-        });
+                });
-      } else {
+            } else {
-        setStyle($player, 'left', `${cachePos.x}px`);
+                setStyle($player, 'left', `${cachePos.x}px`);
-        setStyle($player, 'top', `${cachePos.y}px`);
+                setStyle($player, 'top', `${cachePos.y}px`);
-      }
+            }
 
-      $player.classList.add('artplayer-pip');
+            $player.classList.add('artplayer-pip');
-      player.fullscreenExit();
+            player.fullscreenExit();
-      player.fullscreenWebExit();
+            player.fullscreenWebExit();
-      player.aspectRatioRemove();
+            player.aspectRatioRemove();
-      player.playbackRateRemove();
+            player.playbackRateRemove();
-      art.emit('pipEnabled');
+            art.emit('pipEnabled');
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'pipExit', {
+    Object.defineProperty(player, 'pipExit', {
-    value: () => {
+        value: () => {
-      if (player.pipState) {
+            if (player.pipState) {
-        $player.classList.remove('artplayer-pip');
+                $player.classList.remove('artplayer-pip');
-        cachePos = draggie.position;
+                cachePos = draggie.position;
-        setStyle($player, 'left', null);
+                setStyle($player, 'left', null);
-        setStyle($player, 'top', null);
+                setStyle($player, 'top', null);
-        player.fullscreenExit();
+                player.fullscreenExit();
-        player.fullscreenWebExit();
+                player.fullscreenWebExit();
-        player.aspectRatioRemove();
+                player.aspectRatioRemove();
-        player.playbackRateRemove();
+                player.playbackRateRemove();
-        art.emit('pipExit');
+                art.emit('pipExit');
-      }
+            }
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'pipToggle', {
+    Object.defineProperty(player, 'pipToggle', {
-    value: () => {
+        value: () => {
-      if (player.pipState) {
+            if (player.pipState) {
-        player.pipExit();
+                player.pipExit();
-      } else {
+            } else {
-        player.pipEnabled();
+                player.pipEnabled();
-      }
+            }
-    }
+        },
-  });
+    });
 }
 
 export default function pipMix(art, player) {
-  if (document.pictureInPictureEnabled) {
+    if (document.pictureInPictureEnabled) {
-    nativePip(art, player);
+        nativePip(art, player);
-  } else {
+    } else {
-    customPip(art, player);
+        customPip(art, player);
-  }
+    }
 }

packages/artplayer/src/player/playMix.js

@@ -1,24 +1,27 @@
 export default function playMix(art, player) {
-  const { refs: { $video }, i18n, notice, option: { mutex } } = art;
+    const {
+        refs: { $video },
+        i18n,
+        notice,
+        option: { mutex },
+    } = art;
 
-  Object.defineProperty(player, 'play', {
+    Object.defineProperty(player, 'play', {
-    value: () => {
+        value: () => {
-      const promise = $video.play();
+            const promise = $video.play();
-      if (promise !== undefined) {
+            if (promise !== undefined) {
-        promise.then().catch(err => {
+                promise.then().catch(err => {
-          notice.show(err, true, 3000);
+                    notice.show(err, true, 3000);
-          console.warn(err);
+                    console.warn(err);
-        });
+                });
-      }
+            }
 
-      if (mutex) {
+            if (mutex) {
-        art.constructor.instances
+                art.constructor.instances.filter(item => item !== art).forEach(item => item.player.pause());
-          .filter(item => item !== art)
+            }
-          .forEach(item => item.player.pause());
-      }
 
-      notice.show(i18n.get('Play'));
+            notice.show(i18n.get('Play'));
-      art.emit('play');
+            art.emit('play');
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/playbackRateMix.js

@@ -1,39 +1,43 @@
 import { clamp } from '../utils';
 
 export default function playbackRateMix(art, player) {
-  const { refs: { $video, $player }, i18n, notice } = art;
+    const {
+        refs: { $video, $player },
+        i18n,
+        notice,
+    } = art;
 
-  Object.defineProperty(player, 'playbackRateState', {
+    Object.defineProperty(player, 'playbackRateState', {
-    get: () => $player.dataset.playbackRate
+        get: () => $player.dataset.playbackRate,
-  });
+    });
 
-  Object.defineProperty(player, 'playbackRate', {
+    Object.defineProperty(player, 'playbackRate', {
-    value: rate => {
+        value: rate => {
-      const newRate = clamp(rate, 0.1, 10);
+            const newRate = clamp(rate, 0.1, 10);
-      $video.playbackRate = newRate;
+            $video.playbackRate = newRate;
-      $player.dataset.playbackRate = newRate;
+            $player.dataset.playbackRate = newRate;
-      notice.show(`${i18n.get('Rate')}: ${newRate === 1 ? i18n.get('Normal') : `${newRate}x`}`);
+            notice.show(`${i18n.get('Rate')}: ${newRate === 1 ? i18n.get('Normal') : `${newRate}x`}`);
-      art.emit('playbackRateChange', newRate);
+            art.emit('playbackRateChange', newRate);
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'playbackRateRemove', {
+    Object.defineProperty(player, 'playbackRateRemove', {
-    value: () => {
+        value: () => {
-      if (player.$playbackRateState) {
+            if (player.$playbackRateState) {
-        player.playbackRate(1);
+                player.playbackRate(1);
-        delete $player.dataset.playbackRate;
+                delete $player.dataset.playbackRate;
-        art.emit('playbackRateRemove');
+                art.emit('playbackRateRemove');
-      }
+            }
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'playbackRateReset', {
+    Object.defineProperty(player, 'playbackRateReset', {
-    value: () => {
+        value: () => {
-      const { playbackRate } = $player.dataset;
+            const { playbackRate } = $player.dataset;
-      if (playbackRate) {
+            if (playbackRate) {
-        player.playbackRate(Number(playbackRate));
+                player.playbackRate(Number(playbackRate));
-        art.emit('playbackRateReset');
+                art.emit('playbackRateReset');
-      }
+            }
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/playedMix.js

@@ -1,5 +1,5 @@
 export default function seekMix(art, player) {
-  Object.defineProperty(player, 'played', {
+    Object.defineProperty(player, 'played', {
-    get: () => art.refs.$video.currentTime / art.refs.$video.duration
+        get: () => art.refs.$video.currentTime / art.refs.$video.duration,
-  });
+    });
 }

packages/artplayer/src/player/screenshotMix.js

@@ -1,37 +1,41 @@
 import { setStyle, secondToTime } from '../utils';
 
 export default function screenshotMix(art, player) {
-  const { option, notice, refs: { $video } } = art;
+    const {
+        option,
+        notice,
+        refs: { $video },
+    } = art;
 
-  function captureFrame() {
+    function captureFrame() {
-    const canvas = document.createElement('canvas');
+        const canvas = document.createElement('canvas');
-    canvas.width = $video.videoWidth;
+        canvas.width = $video.videoWidth;
-    canvas.height = $video.videoHeight;
+        canvas.height = $video.videoHeight;
-    canvas.getContext('2d').drawImage($video, 0, 0);
+        canvas.getContext('2d').drawImage($video, 0, 0);
-    const dataUri = canvas.toDataURL('image/png');
+        const dataUri = canvas.toDataURL('image/png');
-    const elink = document.createElement('a');
+        const elink = document.createElement('a');
-    setStyle(elink, 'display', 'none');
+        setStyle(elink, 'display', 'none');
-    elink.href = dataUri;
+        elink.href = dataUri;
-    elink.download = `${option.title || 'artplayer'}_${secondToTime($video.currentTime)}.png`;
+        elink.download = `${option.title || 'artplayer'}_${secondToTime($video.currentTime)}.png`;
-    document.body.appendChild(elink);
+        document.body.appendChild(elink);
-    elink.click();
+        elink.click();
-    document.body.removeChild(elink);
+        document.body.removeChild(elink);
-    return dataUri;
+        return dataUri;
-  }
-
-  Object.defineProperty(player, 'screenshot', {
-    value: () => {
-      const { crossOrigin } = $video;
-      try {
-        $video.crossOrigin = 'anonymous';
-        const dataUri = captureFrame();
-        art.emit('screenshot', dataUri);
-      } catch (error) {
-        notice.show(error);
-        console.warn(error);
-      } finally {
-        $video.crossOrigin = crossOrigin;
-      }
     }
-  });
+
+    Object.defineProperty(player, 'screenshot', {
+        value: () => {
+            const { crossOrigin } = $video;
+            try {
+                $video.crossOrigin = 'anonymous';
+                const dataUri = captureFrame();
+                art.emit('screenshot', dataUri);
+            } catch (error) {
+                notice.show(error);
+                console.warn(error);
+            } finally {
+                $video.crossOrigin = crossOrigin;
+            }
+        },
+    });
 }

packages/artplayer/src/player/seekMix.js

@@ -1,17 +1,17 @@
 import { secondToTime } from '../utils';
 
 export default function seekMix(art, player) {
-  const { notice } = art;
+    const { notice } = art;
 
-  Object.defineProperty(player, 'seek', {
+    Object.defineProperty(player, 'seek', {
-    value: time => {
+        value: time => {
-      let newTime = Math.max(time, 0);
+            let newTime = Math.max(time, 0);
-      if (player.duration) {
+            if (player.duration) {
-        newTime = Math.min(newTime, player.duration);
+                newTime = Math.min(newTime, player.duration);
-      }
+            }
-      player.currentTime = newTime;
+            player.currentTime = newTime;
-      notice.show(`${secondToTime(newTime)} / ${secondToTime(player.duration)}`);
+            notice.show(`${secondToTime(newTime)} / ${secondToTime(player.duration)}`);
-      art.emit('seek', newTime);
+            art.emit('seek', newTime);
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/switchMix.js

@@ -1,22 +1,28 @@
 export default function switchMix(art, player) {
-  const { refs: { $video }, i18n, notice, isPlaying, option } = art;
+    const {
+        refs: { $video },
+        i18n,
+        notice,
+        isPlaying,
+        option,
+    } = art;
 
-  Object.defineProperty(player, 'switch', {
+    Object.defineProperty(player, 'switch', {
-    value: (url, name = 'unknown') => {
+        value: (url, name = 'unknown') => {
-      if (url !== option.url) {
+            if (url !== option.url) {
-        const { currentTime } = player;
+                const { currentTime } = player;
-        art.emit('beforeMountUrl', url);
+                art.emit('beforeMountUrl', url);
-        $video.src = player.mountUrl(url);
+                $video.src = player.mountUrl(url);
-        option.url = url;
+                option.url = url;
-        player.playbackRateRemove();
+                player.playbackRateRemove();
-        player.aspectRatioRemove();
+                player.aspectRatioRemove();
-        player.seek(currentTime);
+                player.seek(currentTime);
-        if (isPlaying) {
+                if (isPlaying) {
-          player.play();
+                    player.play();
-        }
+                }
-        notice.show(`${i18n.get('Switch video')}: ${name}`);
+                notice.show(`${i18n.get('Switch video')}: ${name}`);
-        art.emit('switch', url);
+                art.emit('switch', url);
-      }
+            }
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/toggleMix.js

@@ -1,11 +1,11 @@
 export default function toggleMix(art, player) {
-  Object.defineProperty(player, 'toggle', {
+    Object.defineProperty(player, 'toggle', {
-    value: () => {
+        value: () => {
-      if (art.isPlaying) {
+            if (art.isPlaying) {
-        player.pause();
+                player.pause();
-      } else {
+            } else {
-        player.play();
+                player.play();
-      }
+            }
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/player/volumeMix.js

@@ -1,25 +1,30 @@
 import { clamp } from '../utils';
 
 export default function volumeMix(art, player) {
-  const { refs: { $video }, i18n, notice, storage } = art;
+    const {
+        refs: { $video },
+        i18n,
+        notice,
+        storage,
+    } = art;
 
-  Object.defineProperty(player, 'volume', {
+    Object.defineProperty(player, 'volume', {
-    get: () => $video.volume || 0,
+        get: () => $video.volume || 0,
-    set: percentage => {
+        set: percentage => {
-      if (percentage !== undefined) {
+            if (percentage !== undefined) {
-        $video.volume = clamp(percentage, 0, 1);
+                $video.volume = clamp(percentage, 0, 1);
-        notice.show(`${i18n.get('Volume')}: ${parseInt($video.volume * 100)}`);
+                notice.show(`${i18n.get('Volume')}: ${parseInt($video.volume * 100, 10)}`);
-        if ($video.volume !== 0) {
+                if ($video.volume !== 0) {
-          storage.set('volume', $video.volume);
+                    storage.set('volume', $video.volume);
-        }
+                }
-        art.emit('volumeChange', $video.volume);
+                art.emit('volumeChange', $video.volume);
-      }
+            }
-    }
+        },
-  });
+    });
 
-  Object.defineProperty(player, 'mute', {
+    Object.defineProperty(player, 'mute', {
-    value: () => {
+        value: () => {
-      player.volume = 0;
+            player.volume = 0;
-    }
+        },
-  });
+    });
 }

packages/artplayer/src/scheme/index.js

@@ -2,109 +2,109 @@ import validElement from './validElement';
 import validStringEmpty from './validStringEmpty';
 
 export default {
-  container: {
+    container: {
-    validator: validElement,
+        validator: validElement,
-    required: true
+        required: true,
-  },
+    },
-  url: {
+    url: {
-    type: 'string',
+        type: 'string',
-    required: true,
+        required: true,
-    validator: validStringEmpty
+        validator: validStringEmpty,
-  },
+    },
-  poster: 'string',
+    poster: 'string',
-  title: 'string',
+    title: 'string',
-  type: {
+    type: {
-    type: 'string'
+        type: 'string',
-  },
+    },
-  mimeCodec: 'string',
+    mimeCodec: 'string',
-  theme: 'string',
+    theme: 'string',
-  volume: 'number',
+    volume: 'number',
-  autoplay: 'boolean',
+    autoplay: 'boolean',
-  autoSize: 'boolean',
+    autoSize: 'boolean',
-  loop: 'boolean',
+    loop: 'boolean',
-  playbackRate: 'boolean',
+    playbackRate: 'boolean',
-  aspectRatio: 'boolean',
+    aspectRatio: 'boolean',
-  screenshot: 'boolean',
+    screenshot: 'boolean',
-  setting: 'boolean',
+    setting: 'boolean',
-  hotkey: 'boolean',
+    hotkey: 'boolean',
-  pip: 'boolean',
+    pip: 'boolean',
-  mutex: 'boolean',
+    mutex: 'boolean',
-  fullscreen: 'boolean',
+    fullscreen: 'boolean',
-  fullscreenWeb: 'boolean',
+    fullscreenWeb: 'boolean',
-  layers: {
+    layers: {
-    type: 'array',
+        type: 'array',
-    child: {
+        child: {
-      disable: 'boolean',
+            disable: 'boolean',
-      type: 'object|function',
+            type: 'object|function',
-      name: 'string',
+            name: 'string',
-      index: 'number',
+            index: 'number',
-      html: validElement,
+            html: validElement,
-      style: 'object',
+            style: 'object',
-      click: 'function'
+            click: 'function',
-    }
+        },
-  },
+    },
-  contextmenu: {
+    contextmenu: {
-    type: 'array',
+        type: 'array',
-    child: {
+        child: {
-      disable: 'boolean',
+            disable: 'boolean',
-      type: 'object|function',
+            type: 'object|function',
-      name: 'string',
+            name: 'string',
-      index: 'number',
+            index: 'number',
-      html: validElement,
+            html: validElement,
-      style: 'object',
+            style: 'object',
-      click: 'function'
+            click: 'function',
-    }
+        },
-  },
+    },
-  quality: {
+    quality: {
-    type: 'array',
+        type: 'array',
-    child: {
+        child: {
-      default: 'boolean',
+            default: 'boolean',
-      name: 'string',
+            name: 'string',
-      url: 'string'
+            url: 'string',
-    }
+        },
-  },
+    },
-  controls: {
+    controls: {
-    type: 'array',
+        type: 'array',
-    child: {
+        child: {
-      type: 'object',
+            type: 'object',
-      option: {
+            option: {
+                type: 'object',
+                child: {
+                    disable: 'boolean',
+                    name: 'string',
+                    index: 'number',
+                    position: 'string',
+                },
+            },
+        },
+    },
+    highlight: {
+        type: 'array',
+        child: {
+            type: 'object',
+            time: 'number',
+            text: 'string',
+        },
+    },
+    thumbnails: {
         type: 'object',
         child: {
-          disable: 'boolean',
+            type: 'object',
-          name: 'string',
+            url: 'string',
-          index: 'number',
+            number: 'number',
-          position: 'string'
+            width: 'number',
-        }
+            height: 'number',
-      }
+            column: 'number',
-    }
+        },
-  },
+    },
-  highlight: {
+    subtitle: {
-    type: 'array',
+        type: 'object',
-    child: {
+        child: {
-      type: 'object',
+            type: 'object',
-      time: 'number',
+            url: 'string',
-      text: 'string'
+            style: 'object',
-    }
+        },
-  },
+    },
-  thumbnails: {
+    moreVideoAttr: 'object',
-    type: 'object',
+    lang: 'string',
-    child: {
-      type: 'object',
-      url: 'string',
-      number: 'number',
-      width: 'number',
-      height: 'number',
-      column: 'number'
-    }
-  },
-  subtitle: {
-    type: 'object',
-    child: {
-      type: 'object',
-      url: 'string',
-      style: 'object'
-    }
-  },
-  moreVideoAttr: 'object',
-  lang: 'string'
 };

packages/artplayer/src/scheme/validElement.js

@@ -1,17 +1,17 @@
 import { ArtPlayerError } from '../utils';
 
 export default function validElement(paths, value, type) {
-  if (type === 'string') {
+    if (type === 'string') {
-    if (value.trim() === '') {
+        if (value.trim() === '') {
-      throw new ArtPlayerError(`${paths.join('.')} can not be empty`);
+            throw new ArtPlayerError(`${paths.join('.')} can not be empty`);
-    } else {
+        } else {
-      return true;
+            return true;
+        }
     }
-  }
 
-  if (value instanceof Element) {
+    if (value instanceof Element) {
-    return true;
+        return true;
-  }
+    }
 
-  throw new ArtPlayerError(`${paths.join('.')} require 'string' or 'Element' type, but got '${type}'`);
+    throw new ArtPlayerError(`${paths.join('.')} require 'string' or 'Element' type, but got '${type}'`);
 }

packages/artplayer/src/scheme/validStringEmpty.js

@@ -1,13 +1,13 @@
 import { ArtPlayerError } from '../utils';
 
 export default function validStringEmpty(paths, value, type) {
-  if (type !== 'string') {
+    if (type !== 'string') {
-    throw new ArtPlayerError(`${paths.join('.')} required 'string' type.`);
+        throw new ArtPlayerError(`${paths.join('.')} required 'string' type.`);
-  }
+    }
 
-  if (value.trim() === '') {
+    if (value.trim() === '') {
-    throw new ArtPlayerError(`${paths.join('.')} can not be empty`);
+        throw new ArtPlayerError(`${paths.join('.')} can not be empty`);
-  }
+    }
 
-  return true;
+    return true;
 }

packages/artplayer/src/setting/flip.js

@@ -1,41 +1,46 @@
 import { append, inverseClass } from '../utils';
 
 export default class Flip {
-  constructor(option) {
+    constructor(option) {
-    this.option = option;
+        this.option = option;
-  }
+    }
 
-  apply(art, $setting) {
+    apply(art, $setting) {
-    const { i18n, events: { proxy }, player } = art;
+        const {
-    this.$header = $setting.querySelector('.art-setting-header');
+            i18n,
-    this.$body = $setting.querySelector('.art-setting-body');
+            events: { proxy },
-    this.$btns = append(this.$body, `
+            player,
-      <div class="art-setting-btns">
+        } = art;
-        <div class="art-setting-btn current">
+        this.$header = $setting.querySelector('.art-setting-header');
-          <span data-flip="normal">${i18n.get('Normal')}</span>
+        this.$body = $setting.querySelector('.art-setting-body');
-        </div>
+        this.$btns = append(
-        <div class="art-setting-btn">
+            this.$body,
-          <span data-flip="horizontal">${i18n.get('Horizontal')}</span>
+            `
-        </div>
+              <div class="art-setting-btns">
-        <div class="art-setting-btn">
+                <div class="art-setting-btn current">
-          <span data-flip="vertical">${i18n.get('Vertical')}</span>
+                  <span data-flip="normal">${i18n.get('Normal')}</span>
-        </div>
+                </div>
-      </div>
+                <div class="art-setting-btn">
-    `);
+                  <span data-flip="horizontal">${i18n.get('Horizontal')}</span>
+                </div>
+                <div class="art-setting-btn">
+                  <span data-flip="vertical">${i18n.get('Vertical')}</span>
+                </div>
+              </div>
+            `,
+        );
 
-    proxy(this.$btns, 'click', event => {
+        proxy(this.$btns, 'click', event => {
-      const { target } = event;
+            const { target } = event;
-      const { flip } = target.dataset;
+            const { flip } = target.dataset;
-      if (flip) {
+            if (flip) {
-        player.flip(flip);
+                player.flip(flip);
-      }
+            }
-    });
+        });
 
-    art.on('flipChange', flip => {
+        art.on('flipChange', flip => {
-      const $current = Array.from(this.$btns.querySelectorAll('span')).find(
+            const $current = Array.from(this.$btns.querySelectorAll('span')).find(item => item.dataset.flip === flip);
-        item => item.dataset.flip === flip
+            inverseClass($current.parentElement, 'current');
-      );
+        });
-      inverseClass($current.parentElement, 'current');
+    }
-    });
-  }
 }

packages/artplayer/src/setting/index.js

@@ -3,70 +3,83 @@ import Flip from './flip';
 
 let id = 0;
 export default class Setting {
-  constructor(art) {
+    constructor(art) {
-    id = 0;
+        id = 0;
-    this.art = art;
+        this.art = art;
-    this.state = false;
+        this.state = false;
-    if (art.option.setting) {
+        if (art.option.setting) {
-      this.art.on('firstCanplay', () => {
+            this.art.on('firstCanplay', () => {
-        this.init();
+                this.init();
-      });
+            });
+        }
     }
-  }
 
-  init() {
+    init() {
-    const { refs: { $settingClose }, events: { proxy } } = this.art;
+        const {
+            refs: { $settingClose },
+            events: { proxy },
+        } = this.art;
 
-    proxy($settingClose, 'click', () => {
+        proxy($settingClose, 'click', () => {
-      this.hide();
+            this.hide();
-    });
+        });
 
-    this.add(new Flip({
+        this.add(
-      name: 'flip',
+            new Flip({
-      title: 'Flip',
+                name: 'flip',
-      disable: false,
+                title: 'Flip',
-      index: 10
+                disable: false,
-    }));
+                index: 10,
-  }
+            }),
-
+        );
-  add(setting, callback) {
-    const { option } = setting;
-    if (option && !option.disable) {
-      id++;
-      const { refs, i18n } = this.art;
-      const name = option.name || `setting${id}`;
-      const title = option.title || name;
-      const $setting = document.createElement('div');
-      $setting.setAttribute('class', `art-setting art-setting-${name}`);
-      append($setting, `<div class="art-setting-header">${i18n.get(title)}</div>`);
-      append($setting, '<div class="art-setting-body"></div>');
-      setting.apply && setting.apply(this.art, $setting);
-      insertByIndex(refs.$settingBody, $setting, option.index || id);
-      this[name] = $setting;
-      callback && callback($setting);
-      this.art.emit('setting:add', $setting);
     }
-  }
 
-  show() {
+    add(setting, callback) {
-    const { refs: { $setting } } = this.art;
+        const { option } = setting;
-    setStyle($setting, 'display', 'flex');
+        if (option && !option.disable) {
-    this.state = true;
+            id += 1;
-    this.art.emit('setting:show', $setting);
+            const { refs, i18n } = this.art;
-  }
+            const name = option.name || `setting${id}`;
-
+            const title = option.title || name;
-  hide() {
+            const $setting = document.createElement('div');
-    const { refs: { $setting } } = this.art;
+            $setting.setAttribute('class', `art-setting art-setting-${name}`);
-    setStyle($setting, 'display', 'none');
+            append($setting, `<div class="art-setting-header">${i18n.get(title)}</div>`);
-    this.state = false;
+            append($setting, '<div class="art-setting-body"></div>');
-    this.art.emit('setting:hide', $setting);
+            if (setting.apply) {
-  }
+                setting.apply(this.art, $setting);
-
+            }
-  toggle() {
+            insertByIndex(refs.$settingBody, $setting, option.index || id);
-    if (this.state) {
+            this[name] = $setting;
-      this.hide();
+            if (callback) {
-    } else {
+                callback($setting);
-      this.show();
+            }
+            this.art.emit('setting:add', $setting);
+        }
+    }
+
+    show() {
+        const {
+            refs: { $setting },
+        } = this.art;
+        setStyle($setting, 'display', 'flex');
+        this.state = true;
+        this.art.emit('setting:show', $setting);
+    }
+
+    hide() {
+        const {
+            refs: { $setting },
+        } = this.art;
+        setStyle($setting, 'display', 'none');
+        this.state = false;
+        this.art.emit('setting:hide', $setting);
+    }
+
+    toggle() {
+        if (this.state) {
+            this.hide();
+        } else {
+            this.show();
+        }
     }
-  }
 }

packages/artplayer/src/storage.js

@@ -1,31 +1,31 @@
 import { sleep } from './utils';
 
 export default class Storage {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    this.storageName = 'artplayer_settings';
+        this.storageName = 'artplayer_settings';
-    sleep().then(() => {
+        sleep().then(() => {
-      this.initVolume();
+            this.initVolume();
-    });
+        });
-  }
+    }
-
+
-  get(key) {
+    get(key) {
-    const storage = JSON.parse(localStorage.getItem(this.storageName)) || {};
+        const storage = JSON.parse(localStorage.getItem(this.storageName)) || {};
-    return key ? storage[key] : {};
+        return key ? storage[key] : {};
-  }
+    }
-
+
-  set(key, value) {
+    set(key, value) {
-    const storage = Object.assign({}, this.get(), {
+        const storage = Object.assign({}, this.get(), {
-      [key]: value
+            [key]: value,
-    });
+        });
-    localStorage.setItem(this.storageName, JSON.stringify(storage));
+        localStorage.setItem(this.storageName, JSON.stringify(storage));
-  }
+    }
-
+
-  initVolume() {
+    initVolume() {
-    const { player } = this.art;
+        const { player } = this.art;
-    const volume = this.get('volume');
+        const volume = this.get('volume');
-    if (volume) {
+        if (volume) {
-      player.volume = volume;
+            player.volume = volume;
+        }
     }
-  }
 }

packages/artplayer/src/subtitle.js

@@ -1,128 +1,140 @@
 import { errorHandle, getExt, setStyles, setStyle } from './utils';
 
 export default class Subtitle {
-  constructor(art) {
+    constructor(art) {
-    this.art = art;
+        this.art = art;
-    this.state = true;
+        this.state = true;
-    this.vttText = '';
+        this.vttText = '';
-    const { url } = this.art.option.subtitle;
+        const { url } = this.art.option.subtitle;
-    if (url) {
+        if (url) {
-      this.checkExt(url);
+            this.checkExt(url);
-      this.init();
+            this.init();
-    }
-  }
-
-  init() {
-    const { events: { proxy }, option: { subtitle }, refs: { $video, $subtitle } } = this.art;
-    setStyles($subtitle, subtitle.style || {});
-    const $track = document.createElement('track');
-    $track.default = true;
-    $track.kind = 'metadata';
-    this.load(subtitle.url).then(data => {
-      $track.src = data;
-      $video.appendChild($track);
-      this.art.refs.$track = $track;
-      if ($video.textTracks && $video.textTracks[0]) {
-        const [track] = $video.textTracks;
-        proxy(track, 'cuechange', () => {
-          const [cue] = track.activeCues;
-          $subtitle.innerHTML = '';
-          if (cue) {
-            const template = document.createElement('div');
-            template.appendChild(cue.getCueAsHTML());
-            $subtitle.innerHTML = template.innerHTML
-              .split(/\r?\n/)
-              .map(item => `<p>${item}</p>`)
-              .join('');
-          }
-          this.art.emit('subtitle:update', $subtitle);
-        });
-      }
-    });
-  }
-
-  load(url) {
-    const { notice } = this.art;
-    let type;
-    return fetch(url)
-      .then(response => {
-        type = response.headers.get('Content-Type');
-        return response.text();
-      })
-      .then(text => {
-        if ((/x-subrip/gi).test(type)) {
-          this.vttText = this.srtToVtt(text);
-        } else {
-          this.vttText = text;
         }
-        return this.vttToBlob(this.vttText);
-      })
-      .catch(err => {
-        notice.show(err);
-        console.warn(err);
-        throw err;
-      });
-  }
-
-  srtToVtt(text) {
-    return 'WEBVTT \r\n\r\n'.concat(
-      text
-        .replace(/\{\\([ibu])\}/g, '</$1>')
-        .replace(/\{\\([ibu])1\}/g, '<$1>')
-        .replace(/\{([ibu])\}/g, '<$1>')
-        .replace(/\{\/([ibu])\}/g, '</$1>')
-        .replace(/(\d\d:\d\d:\d\d),(\d\d\d)/g, '$1.$2')
-        .concat('\r\n\r\n')
-    );
-  }
-
-  vttToBlob(vttText) {
-    return URL.createObjectURL(
-      new Blob([vttText], {
-        type: 'text/vtt'
-      })
-    );
-  }
-
-  checkExt(url) {
-    const ext = getExt(url);
-    errorHandle(
-      ext === 'vtt' || ext === 'srt',
-      `'subtitle.url' option require 'vtt' or 'srt' format, but got '${ext}'.`
-    );
-  }
-
-  show() {
-    const { refs: { $subtitle }, i18n, notice } = this.art;
-    setStyle($subtitle, 'display', 'block');
-    this.state = true;
-    notice.show(i18n.get('Show subtitle'));
-    this.art.emit('subtitle:show', $subtitle);
-  }
-
-  hide() {
-    const { refs: { $subtitle }, i18n, notice } = this.art;
-    setStyle($subtitle, 'display', 'none');
-    this.state = false;
-    notice.show(i18n.get('Hide subtitle'));
-    this.art.emit('subtitle:hide', $subtitle);
-  }
-
-  toggle() {
-    if (this.state) {
-      this.hide();
-    } else {
-      this.show();
     }
-  }
 
-  switch(url) {
+    init() {
-    const { $track } = this.art.refs;
+        const {
-    this.checkExt(url);
+            events: { proxy },
-    errorHandle($track, 'You need to initialize the subtitle option first.');
+            option: { subtitle },
-    this.load(url).then(data => {
+            refs: { $video, $subtitle },
-      $track.src = data;
+        } = this.art;
-      this.art.emit('subtitle:switch', url);
+        setStyles($subtitle, subtitle.style || {});
-    });
+        const $track = document.createElement('track');
-  }
+        $track.default = true;
+        $track.kind = 'metadata';
+        this.load(subtitle.url).then(data => {
+            $track.src = data;
+            $video.appendChild($track);
+            this.art.refs.$track = $track;
+            if ($video.textTracks && $video.textTracks[0]) {
+                const [track] = $video.textTracks;
+                proxy(track, 'cuechange', () => {
+                    const [cue] = track.activeCues;
+                    $subtitle.innerHTML = '';
+                    if (cue) {
+                        const template = document.createElement('div');
+                        template.appendChild(cue.getCueAsHTML());
+                        $subtitle.innerHTML = template.innerHTML
+                            .split(/\r?\n/)
+                            .map(item => `<p>${item}</p>`)
+                            .join('');
+                    }
+                    this.art.emit('subtitle:update', $subtitle);
+                });
+            }
+        });
+    }
+
+    load(url) {
+        const { notice } = this.art;
+        let type;
+        return fetch(url)
+            .then(response => {
+                type = response.headers.get('Content-Type');
+                return response.text();
+            })
+            .then(text => {
+                if (/x-subrip/gi.test(type)) {
+                    this.vttText = this.srtToVtt(text);
+                } else {
+                    this.vttText = text;
+                }
+                return this.vttToBlob(this.vttText);
+            })
+            .catch(err => {
+                notice.show(err);
+                console.warn(err);
+                throw err;
+            });
+    }
+
+    srtToVtt(text) {
+        return 'WEBVTT \r\n\r\n'.concat(
+            text
+                .replace(/\{\\([ibu])\}/g, '</$1>')
+                .replace(/\{\\([ibu])1\}/g, '<$1>')
+                .replace(/\{([ibu])\}/g, '<$1>')
+                .replace(/\{\/([ibu])\}/g, '</$1>')
+                .replace(/(\d\d:\d\d:\d\d),(\d\d\d)/g, '$1.$2')
+                .concat('\r\n\r\n'),
+        );
+    }
+
+    vttToBlob(vttText) {
+        return URL.createObjectURL(
+            new Blob([vttText], {
+                type: 'text/vtt',
+            }),
+        );
+    }
+
+    checkExt(url) {
+        const ext = getExt(url);
+        errorHandle(
+            ext === 'vtt' || ext === 'srt',
+            `'subtitle.url' option require 'vtt' or 'srt' format, but got '${ext}'.`,
+        );
+    }
+
+    show() {
+        const {
+            refs: { $subtitle },
+            i18n,
+            notice,
+        } = this.art;
+        setStyle($subtitle, 'display', 'block');
+        this.state = true;
+        notice.show(i18n.get('Show subtitle'));
+        this.art.emit('subtitle:show', $subtitle);
+    }
+
+    hide() {
+        const {
+            refs: { $subtitle },
+            i18n,
+            notice,
+        } = this.art;
+        setStyle($subtitle, 'display', 'none');
+        this.state = false;
+        notice.show(i18n.get('Hide subtitle'));
+        this.art.emit('subtitle:hide', $subtitle);
+    }
+
+    toggle() {
+        if (this.state) {
+            this.hide();
+        } else {
+            this.show();
+        }
+    }
+
+    switch(url) {
+        const { $track } = this.art.refs;
+        this.checkExt(url);
+        errorHandle($track, 'You need to initialize the subtitle option first.');
+        this.load(url).then(data => {
+            $track.src = data;
+            this.art.emit('subtitle:switch', url);
+        });
+    }
 }

packages/artplayer/src/template.js

@@ -1,63 +1,63 @@
 export default class Template {
-  constructor(art) {
+    constructor(art) {
-    const { refs } = art;
+        const { refs } = art;
-    refs.$container.innerHTML = `
+        refs.$container.innerHTML = `
-      <div class="artplayer-video-player">
+          <div class="artplayer-video-player">
-        <video data-index="10" class="artplayer-video"></video>
+            <video data-index="10" class="artplayer-video"></video>
-        <div data-index="20" class="artplayer-subtitle"></div>
+            <div data-index="20" class="artplayer-subtitle"></div>
-        <div data-index="30" class="artplayer-layers"></div>
+            <div data-index="30" class="artplayer-layers"></div>
-        <div data-index="40" class="artplayer-mask"></div>
+            <div data-index="40" class="artplayer-mask"></div>
-        <div data-index="50" class="artplayer-bottom">
+            <div data-index="50" class="artplayer-bottom">
-          <div class="artplayer-progress"></div>
+              <div class="artplayer-progress"></div>
-          <div class="artplayer-controls">
+              <div class="artplayer-controls">
-            <div class="artplayer-controls-left"></div>
+                <div class="artplayer-controls-left"></div>
-            <div class="artplayer-controls-right"></div>
+                <div class="artplayer-controls-right"></div>
+              </div>
+            </div>
+            <div data-index="60" class="artplayer-loading"></div>
+            <div data-index="70" class="artplayer-notice">
+              <div class="artplayer-notice-inner"></div>
+            </div>
+            <div data-index="80" class="artplayer-setting">
+              <div class="artplayer-setting-inner">
+                <div class="artplayer-setting-body"></div>
+                <div class="artplayer-setting-close">×</div>
+              </div>
+            </div>
+            <div data-index="90" class="artplayer-info">
+              <div class="artplayer-info-panel"></div>
+              <div class="artplayer-info-close">[x]</div>
+            </div>
+            <div data-index="100" class="artplayer-pip-header">
+              <div class="artplayer-pip-title"></div>
+              <div class="artplayer-pip-close">×</div>
+            </div>
+            <div data-index="110" class="artplayer-contextmenu"></div>
           </div>
-        </div>
+        `;
-        <div data-index="60" class="artplayer-loading"></div>
+        refs.$player = refs.$container.querySelector('.artplayer-video-player');
-        <div data-index="70" class="artplayer-notice">
+        refs.$video = refs.$container.querySelector('.artplayer-video');
-          <div class="artplayer-notice-inner"></div>
+        refs.$subtitle = refs.$container.querySelector('.artplayer-subtitle');
-        </div>
+        refs.$bottom = refs.$container.querySelector('.artplayer-bottom');
-        <div data-index="80" class="artplayer-setting">
+        refs.$progress = refs.$container.querySelector('.artplayer-progress');
-          <div class="artplayer-setting-inner">
+        refs.$controls = refs.$container.querySelector('.artplayer-controls');
-            <div class="artplayer-setting-body"></div>
+        refs.$controlsLeft = refs.$container.querySelector('.artplayer-controls-left');
-            <div class="artplayer-setting-close">×</div>
+        refs.$controlsRight = refs.$container.querySelector('.artplayer-controls-right');
-          </div>
+        refs.$layers = refs.$container.querySelector('.artplayer-layers');
-        </div>
+        refs.$loading = refs.$container.querySelector('.artplayer-loading');
-        <div data-index="90" class="artplayer-info">
+        refs.$notice = refs.$container.querySelector('.artplayer-notice');
-          <div class="artplayer-info-panel"></div>
+        refs.$noticeInner = refs.$container.querySelector('.artplayer-notice-inner');
-          <div class="artplayer-info-close">[x]</div>
+        refs.$mask = refs.$container.querySelector('.artplayer-mask');
-        </div>
+        refs.$setting = refs.$container.querySelector('.artplayer-setting');
-        <div data-index="100" class="artplayer-pip-header">
+        refs.$settingInner = refs.$container.querySelector('.artplayer-setting-inner');
-          <div class="artplayer-pip-title"></div>
+        refs.$settingBody = refs.$container.querySelector('.artplayer-setting-body');
-          <div class="artplayer-pip-close">×</div>
+        refs.$settingClose = refs.$container.querySelector('.artplayer-setting-close');
-        </div>
+        refs.$info = refs.$container.querySelector('.artplayer-info');
-        <div data-index="110" class="artplayer-contextmenu"></div>
+        refs.$infoPanel = refs.$container.querySelector('.artplayer-info-panel');
-      </div>
+        refs.$infoClose = refs.$container.querySelector('.artplayer-info-close');
-    `;
+        refs.$pipHeader = refs.$container.querySelector('.artplayer-pip-header');
-    refs.$player = refs.$container.querySelector('.artplayer-video-player');
+        refs.$pipTitle = refs.$container.querySelector('.artplayer-pip-title');
-    refs.$video = refs.$container.querySelector('.artplayer-video');
+        refs.$pipClose = refs.$container.querySelector('.artplayer-pip-close');
-    refs.$subtitle = refs.$container.querySelector('.artplayer-subtitle');
+        refs.$contextmenu = refs.$container.querySelector('.artplayer-contextmenu');
-    refs.$bottom = refs.$container.querySelector('.artplayer-bottom');
+    }
-    refs.$progress = refs.$container.querySelector('.artplayer-progress');
-    refs.$controls = refs.$container.querySelector('.artplayer-controls');
-    refs.$controlsLeft = refs.$container.querySelector('.artplayer-controls-left');
-    refs.$controlsRight = refs.$container.querySelector('.artplayer-controls-right');
-    refs.$layers = refs.$container.querySelector('.artplayer-layers');
-    refs.$loading = refs.$container.querySelector('.artplayer-loading');
-    refs.$notice = refs.$container.querySelector('.artplayer-notice');
-    refs.$noticeInner = refs.$container.querySelector('.artplayer-notice-inner');
-    refs.$mask = refs.$container.querySelector('.artplayer-mask');
-    refs.$setting = refs.$container.querySelector('.artplayer-setting');
-    refs.$settingInner = refs.$container.querySelector('.artplayer-setting-inner');
-    refs.$settingBody = refs.$container.querySelector('.artplayer-setting-body');
-    refs.$settingClose = refs.$container.querySelector('.artplayer-setting-close');
-    refs.$info = refs.$container.querySelector('.artplayer-info');
-    refs.$infoPanel = refs.$container.querySelector('.artplayer-info-panel');
-    refs.$infoClose = refs.$container.querySelector('.artplayer-info-close');
-    refs.$pipHeader = refs.$container.querySelector('.artplayer-pip-header');
-    refs.$pipTitle = refs.$container.querySelector('.artplayer-pip-title');
-    refs.$pipClose = refs.$container.querySelector('.artplayer-pip-close');
-    refs.$contextmenu = refs.$container.querySelector('.artplayer-contextmenu');
-  }
 }

packages/artplayer/src/utils/index.js

@@ -1,148 +1,120 @@
 export const instances = [];
 
 export class ArtPlayerError extends Error {
-  constructor(message, context) {
+    constructor(message, context) {
-    super(message);
+        super(message);
-    if (typeof Error.captureStackTrace === 'function') {
+        if (typeof Error.captureStackTrace === 'function') {
-      Error.captureStackTrace(this, context || this.constructor);
+            Error.captureStackTrace(this, context || this.constructor);
+        }
+        this.name = 'ArtPlayerError';
     }
-    this.name = 'ArtPlayerError';
-  }
 }
 
 export function errorHandle(condition, msg) {
-  const isFun = typeof condition === 'function';
+    const isFun = typeof condition === 'function';
-  if (isFun ? !isFun() : !condition) {
+    if (isFun ? !isFun() : !condition) {
-    throw new ArtPlayerError(msg);
+        throw new ArtPlayerError(msg);
-  }
+    }
 }
 
 export function clamp(num, a, b) {
-  return Math.max(Math.min(num, Math.max(a, b)), Math.min(a, b));
+    return Math.max(Math.min(num, Math.max(a, b)), Math.min(a, b));
 }
 
 export function getExt(url) {
-  if (url.includes('?')) {
+    if (url.includes('?')) {
-    return getExt(url.split('?')[0]);
+        return getExt(url.split('?')[0]);
-  }
+    }
 
-  if (url.includes('#')) {
+    if (url.includes('#')) {
-    return getExt(url.split('#')[0]);
+        return getExt(url.split('#')[0]);
-  }
+    }
 
-  return url
+    return url
-    .trim()
+        .trim()
-    .toLowerCase()
+        .toLowerCase()
-    .split('.')
+        .split('.')
-    .pop();
+        .pop();
 }
 
 export function append(parent, child) {
-  if (child instanceof Element) {
+    if (child instanceof Element) {
-    parent.appendChild(child);
+        parent.appendChild(child);
-  } else {
+    } else {
-    parent.insertAdjacentHTML('beforeend', child);
+        parent.insertAdjacentHTML('beforeend', child);
-  }
+    }
-  return parent.lastElementChild;
+    return parent.lastElementChild;
 }
 
 export function insertByIndex(parent, child, index) {
-  const childs = Array.from(parent.children);
+    const childs = Array.from(parent.children);
-  child.dataset.index = index;
+    child.dataset.index = index;
-  const nextChild = childs.find(item => Number(item.dataset.index) >= Number(index));
+    const nextChild = childs.find(item => Number(item.dataset.index) >= Number(index));
-  if (nextChild) {
+    if (nextChild) {
-    nextChild.insertAdjacentElement('beforebegin', child);
+        nextChild.insertAdjacentElement('beforebegin', child);
-  } else {
+    } else {
-    append(parent, child);
+        append(parent, child);
-  }
+    }
-  return child;
+    return child;
 }
 
 export function setStyle(element, key, value) {
-  element.style[key] = value;
+    element.style[key] = value;
-  return element;
+    return element;
 }
 
 export function setStyles(element, styles) {
-  Object.keys(styles).forEach(key => {
+    Object.keys(styles).forEach(key => {
-    setStyle(element, key, styles[key]);
+        setStyle(element, key, styles[key]);
-  });
+    });
-  return element;
+    return element;
 }
 
 export function getStyle(element, key, numberType = true) {
-  const value = window.getComputedStyle(element, null).getPropertyValue(key);
+    const value = window.getComputedStyle(element, null).getPropertyValue(key);
-  return numberType ? parseFloat(value) : value;
+    return numberType ? parseFloat(value) : value;
 }
 
 export function secondToTime(second) {
-  const add0 = num => num < 10 ? `0${num}` : String(num);
+    const add0 = num => (num < 10 ? `0${num}` : String(num));
-  const hour = Math.floor(second / 3600);
+    const hour = Math.floor(second / 3600);
-  const min = Math.floor((second - hour * 3600) / 60);
+    const min = Math.floor((second - hour * 3600) / 60);
-  const sec = Math.floor(second - hour * 3600 - min * 60);
+    const sec = Math.floor(second - hour * 3600 - min * 60);
-  return (hour > 0 ? [hour, min, sec] : [min, sec]).map(add0).join(':');
+    return (hour > 0 ? [hour, min, sec] : [min, sec]).map(add0).join(':');
-}
-
-export function deepMerge(...sources) {
-  const isObject = value => value !== null && typeof value === 'object';
-  let returnValue = {};
-  for (const source of sources) {
-    if (Array.isArray(source)) {
-      if (!Array.isArray(returnValue)) {
-        returnValue = [];
-      }
-      returnValue = [...returnValue, ...source];
-    } else if (isObject(source)) {
-      if (source instanceof Element) {
-        return source;
-      }
-      for (const key in source) {
-        if (source.hasOwnProperty(key)) {
-          let value = source[key];
-          if (isObject(value) && key in returnValue) {
-            value = deepMerge(returnValue[key], value);
-          }
-          returnValue = { ...returnValue, [key]: value };
-        }
-      }
-    }
-  }
-  return returnValue;
 }
 
 export function tooltip(target, msg, pos = 'up') {
-  target.setAttribute('data-balloon', msg);
+    target.setAttribute('data-balloon', msg);
-  target.setAttribute('data-balloon-pos', pos);
+    target.setAttribute('data-balloon-pos', pos);
 }
 
 export function sleep(ms = 0) {
-  return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise(resolve => setTimeout(resolve, ms));
 }
 
 export function sublings(target) {
-  return Array.from(target.parentElement.children).filter(item => item !== target);
+    return Array.from(target.parentElement.children).filter(item => item !== target);
 }
 
 export function inverseClass(target, className) {
-  sublings(target).forEach(item => item.classList.remove(className));
+    sublings(target).forEach(item => item.classList.remove(className));
-  target.classList.add(className);
+    target.classList.add(className);
 }
 
 export function debounce(func, wait, context) {
-  let timeout;
+    let timeout;
-  function fn() {
+    function fn(...args) {
-    const args = arguments;
+        const later = function later() {
-    const later = function later() {
+            timeout = null;
-      timeout = null;
+            func.apply(context, args);
-      func.apply(context, args);
+        };
+        clearTimeout(timeout);
+        timeout = setTimeout(later, wait);
+    }
+
+    fn.clearTimeout = function ct() {
+        clearTimeout(timeout);
     };
-    clearTimeout(timeout);
-    timeout = setTimeout(later, wait);
-  }
 
-  fn.clearTimeout = function ct() {
+    return fn;
-    clearTimeout(timeout);
-  };
-
-  return fn;
 }