修改switcher逻辑

docs/assets/example/index.js

@@ -1,6 +1,6 @@
 var art = new Artplayer({
     container: '.artplayer-app',
-    url: '/assets/sample/video.mp4',
+    url: 'https://artplayer.org/assets/sample/video.mp4',
     title: 'One More Time One More Chance',
     poster: '/assets/sample/poster.jpg',
     volume: 0.5,

docs/assets/js/common.js

@@ -11,11 +11,11 @@
     var $popups = document.querySelector('.popups');
     var loaddLib = [];
 
-    consola.creat({
+    // consola.creat({
-        target: '.console',
+    //     target: '.console',
-        size: '100%',
+    //     size: '100%',
-        zIndex: 99,
+    //     zIndex: 99,
-    });
+    // });
 
     var mirror = CodeMirror($codeMirror, {
         lineNumbers: true,

docs/uncompiled/artplayer.js

@@ -2328,21 +2328,24 @@
 
     createClass(Component, [{
       key: "add",
-      value: function add(getOption, callback) {
+      value: function add(option) {
         var _this = this;
 
-        var option = typeof getOption === 'function' ? getOption(this.art) : getOption;
         if (!this.$parent || !this.name || option.disable) return;
-        this.id += 1;
         var name = option.name || "".concat(this.name).concat(this.id);
         errorHandle(!has(this, name), "Cannot add an existing name [".concat(name, "] to the [").concat(this.name, "]"));
+        this.id += 1;
         var $ref = document.createElement('div');
         $ref.classList.value = "art-".concat(this.name, " art-").concat(this.name, "-").concat(name);
+        var $value = document.createElement('div');
 
         if (option.html) {
-          append($ref, option.html);
+          append($value, option.html);
+          append($ref, $value);
         }
 
+        if (option.switcher) ;
+
         if (option.style) {
           setStyles($ref, option.style);
         }
@@ -2363,26 +2366,39 @@
           append(this.$parent, $ref);
         }
 
+        var result = {
+          $ref: $ref,
+          $value: $value,
+
+          get value() {
+            return $value.innerHTML;
+          },
+
+          set value(html) {
+            $value.innerHTML = html;
+          }
+
+        };
+        def(this, name, {
+          get: function get() {
+            return result;
+          }
+        });
+
         if (option.click) {
           this.art.events.proxy($ref, 'click', function (event) {
             event.preventDefault();
-            option.click.call(_this.art, _this, event);
+            option.click.call(_this.art, event);
           });
         }
 
         if (option.mounted) {
-          option.mounted($ref, this, this.art);
+          option.mounted.call(this.art, $ref);
         }
 
-        if (callback) {
+        if (option.position !== 'top' && !($ref.firstElementChild && $ref.firstElementChild.tagName === 'I')) {
-          callback($ref, this, this.art);
+          addClass($ref, 'art-control-onlyText');
         }
-
-        def(this, name, {
-          get: function get() {
-            return option;
-          }
-        });
       }
     }, {
       key: "show",
@@ -3106,11 +3122,8 @@
 
     createClass(Control, [{
       key: "add",
-      value: function add(getOption, callback) {
+      value: function add(getOption) {
-        var _this2 = this;
-
         var option = typeof getOption === 'function' ? getOption(this.art) : getOption;
-        errorHandle(['top', 'left', 'right'].includes(option.position), "Control option.position must one of 'top', 'left', 'right'");
         var _this$art$template = this.art.template,
             $progress = _this$art$template.$progress,
             $controlsLeft = _this$art$template.$controlsLeft,
@@ -3128,17 +3141,13 @@
           case 'right':
             this.$parent = $controlsRight;
             break;
+
+          default:
+            errorHandle(false, "Control option.position must one of 'top', 'left', 'right'");
+            break;
         }
 
-        get(getPrototypeOf(Control.prototype), "add", this).call(this, option, function ($ref) {
+        get(getPrototypeOf(Control.prototype), "add", this).call(this, option);
-          if (!option.disable && option.position !== 'top' && !($ref.firstElementChild && $ref.firstElementChild.tagName === 'I')) {
-            addClass($ref, 'art-control-onlyText');
-          }
-
-          if (callback) {
-            callback($ref, _this2, _this2.art);
-          }
-        });
       }
     }]);
 

docs/uncompiled/artplayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"artplayer.js","sources":["../../node_modules/@babel/runtime/helpers/classCallCheck.js","../../node_modules/@babel/runtime/helpers/createClass.js","../../node_modules/@babel/runtime/helpers/typeof.js","../../node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../node_modules/@babel/runtime/helpers/inherits.js","../../node_modules/style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/@babel/runtime/helpers/isNativeFunction.js","../../node_modules/@babel/runtime/helpers/construct.js","../../node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../node_modules/@babel/runtime/helpers/iterableToArray.js","../../node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../node_modules/@babel/runtime/helpers/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/@babel/runtime/helpers/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/fullscreenRotateMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/lightMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMin.js","../../packages/artplayer/src/player/index.js","../../node_modules/@babel/runtime/helpers/superPropBase.js","../../node_modules/@babel/runtime/helpers/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.js","../../packages/artplayer/src/control/loop.js","../../packages/artplayer/src/control/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","../../packages/artplayer/src/contextmenu/light.js","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","../../packages/artplayer/src/events/clickInit.js","../../packages/artplayer/src/events/hoverInit.js","../../packages/artplayer/src/events/mousemoveInit.js","../../packages/artplayer/src/events/resizeInit.js","../../packages/artplayer/src/events/gestureILine truncated
+{"version":3,"file":"artplayer.js","sources":["../../node_modules/@babel/runtime/helpers/classCallCheck.js","../../node_modules/@babel/runtime/helpers/createClass.js","../../node_modules/@babel/runtime/helpers/typeof.js","../../node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../node_modules/@babel/runtime/helpers/inherits.js","../../node_modules/style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/@babel/runtime/helpers/isNativeFunction.js","../../node_modules/@babel/runtime/helpers/construct.js","../../node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../node_modules/@babel/runtime/helpers/iterableToArray.js","../../node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../node_modules/@babel/runtime/helpers/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/@babel/runtime/helpers/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/fullscreenRotateMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/lightMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMin.js","../../packages/artplayer/src/player/index.js","../../node_modules/@babel/runtime/helpers/superPropBase.js","../../node_modules/@babel/runtime/helpers/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.js","../../packages/artplayer/src/control/loop.js","../../packages/artplayer/src/control/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","../../packages/artplayer/src/contextmenu/light.js","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","../../packages/artplayer/src/events/clickInit.js","../../packages/artplayer/src/events/hoverInit.js","../../packages/artplayer/src/events/mousemoveInit.js","../../packages/artplayer/src/events/resizeInit.js","../../packages/artplayer/src/events/gestureILine truncated

packages/artplayer/src/control/index.js

@@ -160,12 +160,8 @@ export default class Control extends Component {
         });
     }
 
-    add(getOption, callback) {
+    add(getOption) {
         const option = typeof getOption === 'function' ? getOption(this.art) : getOption;
-        errorHandle(
-            ['top', 'left', 'right'].includes(option.position),
-            `Control option.position must one of 'top', 'left', 'right'`,
-        );
         const { $progress, $controlsLeft, $controlsRight } = this.art.template;
 
         switch (option.position) {
@@ -179,21 +175,10 @@ export default class Control extends Component {
                 this.$parent = $controlsRight;
                 break;
             default:
+                errorHandle(false, `Control option.position must one of 'top', 'left', 'right'`);
                 break;
         }
 
-        super.add(option, ($ref) => {
+        super.add(option);
-            if (
-                !option.disable &&
-                option.position !== 'top' &&
-                !($ref.firstElementChild && $ref.firstElementChild.tagName === 'I')
-            ) {
-                addClass($ref, 'art-control-onlyText');
-            }
-
-            if (callback) {
-                callback($ref, this, this.art);
-            }
-        });
     }
 }

packages/artplayer/src/utils/component.js

@@ -30,17 +30,23 @@ export default class Component {
         }
     }
 
-    add(getOption, callback) {
+    add(option) {
-        const option = typeof getOption === 'function' ? getOption(this.art) : getOption;
         if (!this.$parent || !this.name || option.disable) return;
-        this.id += 1;
         const name = option.name || `${this.name}${this.id}`;
         errorHandle(!has(this, name), `Cannot add an existing name [${name}] to the [${this.name}]`);
+
+        this.id += 1;
         const $ref = document.createElement('div');
         $ref.classList.value = `art-${this.name} art-${this.name}-${name}`;
 
+        const $value = document.createElement('div');
         if (option.html) {
-            append($ref, option.html);
+            append($value, option.html);
+            append($ref, $value);
+        }
+
+        if (option.switcher) {
+            //
         }
 
         if (option.style) {
@@ -60,23 +66,34 @@ export default class Component {
             append(this.$parent, $ref);
         }
 
+        const result = {
+            $ref,
+            $value,
+            get value() {
+                return $value.innerHTML;
+            },
+            set value(html) {
+                $value.innerHTML = html;
+            },
+        };
+
+        def(this, name, {
+            get: () => result,
+        });
+
         if (option.click) {
             this.art.events.proxy($ref, 'click', (event) => {
                 event.preventDefault();
-                option.click.call(this.art, this, event);
+                option.click.call(this.art, event);
             });
         }
 
         if (option.mounted) {
-            option.mounted($ref, this, this.art);
+            option.mounted.call(this.art, $ref);
         }
 
-        if (callback) {
+        if (option.position !== 'top' && !($ref.firstElementChild && $ref.firstElementChild.tagName === 'I')) {
-            callback($ref, this, this.art);
+            addClass($ref, 'art-control-onlyText');
         }
-
-        def(this, name, {
-            get: () => option,
-        });
     }
 }