优化ready事件

This commit is contained in:
Harvey committed 2020-05-15 12:01:43 +08:00
1 parent 7b3913e318
commit 4cbefa172d
11 files changed
+21 -37

No files matched your search

+10 -19
View File
@@ -1171,7 +1171,6 @@
$video = _art$template.$video,
i18n = art.i18n,
notice = art.notice;
var isReady = false;
var reconnectTime = 0;
var maxReconnectTime = 5;
proxy($video, 'click', function () {
@@ -1192,11 +1191,7 @@
art.loading.show = false;
art.controls.show = true;
art.mask.show = true;
if (!isReady) {
art.emit('ready');
isReady = true;
}
art.emit('ready');
}); // art.on('video:canplaythrough', () => {
// });
// art.on('video:durationchange', () => {
@@ -1243,11 +1238,7 @@
art.loading.show = false;
art.controls.show = true;
art.mask.show = true;
if (!isReady) {
art.emit('ready');
isReady = true;
}
art.emit('ready');
}
});
art.on('video:loadstart', function () {
@@ -2889,7 +2880,7 @@
}
}, 3000);
_this.cancelDelayHide = _this.delayHide.clearTimeout;
art.on('ready', function () {
art.once('ready', function () {
_this.add(progress({
name: 'progress',
disable: option.isLive,
@@ -3168,7 +3159,7 @@
$contextmenu = _art$template.$contextmenu,
proxy = art.events.proxy;
_this.$parent = $contextmenu;
art.on('ready', function () {
art.once('ready', function () {
_this.add(playbackRate({
disable: !option.playbackRate,
name: 'playbackRate',
@@ -3534,7 +3525,7 @@
this.loadImg = this.loadImg.bind(this);
if (art.whitelist.state) {
art.on('ready', function () {
art.once('ready', function () {
clickInit(art, _this);
hoverInit(art, _this);
mousemoveInitInit(art, _this);
@@ -3634,7 +3625,7 @@
proxy = art.events.proxy;
if (option.hotkey) {
art.on('ready', function () {
art.once('ready', function () {
_this.add(27, function () {
if (player.fullscreenWeb) {
player.fullscreenWeb = false;
@@ -3710,7 +3701,7 @@
_this = possibleConstructorReturn(this, getPrototypeOf(Layer).call(this, art));
_this.name = 'layer';
_this.$parent = art.template.$layer;
art.on('ready', function () {
art.once('ready', function () {
art.option.layers.forEach(function (item) {
_this.add(item);
});
@@ -3957,7 +3948,7 @@
_this.$parent = $settingBody;
if (option.setting) {
art.on('ready', function () {
art.once('ready', function () {
proxy($setting, 'click', function (e) {
if (e.target === $setting) {
_this.show = false;
@@ -4149,7 +4140,7 @@
});
}
art.on('ready', function () {
art.once('ready', function () {
setting.add({
title: 'Local Video',
name: 'localVideo',
@@ -4209,7 +4200,7 @@
});
}
art.on('ready', function () {
art.once('ready', function () {
setting.add({
title: 'Local Subtitle',
name: 'localSubtitle',
+1 -1
View File
@@ -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","../../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/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/lightMix.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","../../node_modules/@babel/runtime/helpers/defineProperty.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/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/index.js","../../packages/artplayer/src/hotkey.js","../../packages/artplayer/src/layer.js","../../packages/artplayer/src/loading.js","../../packages/artplayer/src/notice.js","../../packages/artplayer/src/mask.js","../../packages/artplayer/src/icons/index.js","../../pacLine 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","../../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/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/lightMix.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","../../node_modules/@babel/runtime/helpers/defineProperty.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/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/index.js","../../packages/artplayer/src/hotkey.js","../../packages/artplayer/src/layer.js","../../packages/artplayer/src/loading.js","../../packages/artplayer/src/notice.js","../../packages/artplayer/src/mask.js","../../packages/artplayer/src/icons/index.js","../../pacLine truncated
+1 -1
View File
@@ -21,7 +21,7 @@ export default class Contextmenu extends Component {
this.$parent = $contextmenu;
art.on('ready', () => {
art.once('ready', () => {
this.add(
playbackRate({
disable: !option.playbackRate,
+1 -1
View File
@@ -35,7 +35,7 @@ export default class Control extends Component {
this.cancelDelayHide = this.delayHide.clearTimeout;
art.on('ready', () => {
art.once('ready', () => {
this.add(
progress({
name: 'progress',
+1 -1
View File
@@ -11,7 +11,7 @@ export default class Events {
this.loadImg = this.loadImg.bind(this);
if (art.whitelist.state) {
art.on('ready', () => {
art.once('ready', () => {
clickInit(art, this);
hoverInit(art, this);
mousemoveInit(art, this);
+1 -1
View File
@@ -9,7 +9,7 @@ export default class Hotkey {
} = art;
if (option.hotkey) {
art.on('ready', () => {
art.once('ready', () => {
this.add(27, () => {
if (player.fullscreenWeb) {
player.fullscreenWeb = false;
+1 -1
View File
@@ -5,7 +5,7 @@ export default class Layer extends Component {
super(art);
this.name = 'layer';
this.$parent = art.template.$layer;
art.on('ready', () => {
art.once('ready', () => {
art.option.layers.forEach(item => {
this.add(item);
});
+2 -9
View File
@@ -10,7 +10,6 @@ export default function eventInit(art, player) {
notice,
} = art;
let isReady = false;
let reconnectTime = 0;
const maxReconnectTime = 5;
@@ -37,10 +36,7 @@ export default function eventInit(art, player) {
art.loading.show = false;
art.controls.show = true;
art.mask.show = true;
if (!isReady) {
art.emit('ready');
isReady = true;
}
art.emit('ready');
});
// art.on('video:canplaythrough', () => {
@@ -97,10 +93,7 @@ export default function eventInit(art, player) {
art.loading.show = false;
art.controls.show = true;
art.mask.show = true;
if (!isReady) {
art.emit('ready');
isReady = true;
}
art.emit('ready');
}
});
@@ -38,7 +38,7 @@ export default function localSubtitle(art) {
});
}
art.on('ready', () => {
art.once('ready', () => {
setting.add({
title: 'Local Subtitle',
name: 'localSubtitle',
+1 -1
View File
@@ -51,7 +51,7 @@ export default function localVideo(art) {
});
}
art.on('ready', () => {
art.once('ready', () => {
setting.add({
title: 'Local Video',
name: 'localVideo',
+1 -1
View File
@@ -18,7 +18,7 @@ export default class Setting extends Component {
this.$parent = $settingBody;
if (option.setting) {
art.on('ready', () => {
art.once('ready', () => {
proxy($setting, 'click', e => {
if (e.target === $setting) {
this.show = false;