mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-27 17:51:20 -08:00
Fix some notice
This commit is contained in:
1 parent
1de2d2aaed
commit
c9040e5eec
5 files changed
+36
-9
No files matched your search
@@ -1609,7 +1609,8 @@
|
|||||||
var screenfull = screenfull$1.exports;
|
var screenfull = screenfull$1.exports;
|
||||||
|
|
||||||
var nativeScreenfull = function nativeScreenfull(art) {
|
var nativeScreenfull = function nativeScreenfull(art) {
|
||||||
var $player = art.template.$player;
|
var notice = art.notice,
|
||||||
|
$player = art.template.$player;
|
||||||
screenfull.on('change', function () {
|
screenfull.on('change', function () {
|
||||||
return art.emit('fullscreen', screenfull.isFullscreen);
|
return art.emit('fullscreen', screenfull.isFullscreen);
|
||||||
});
|
});
|
||||||
@@ -1625,6 +1626,7 @@
|
|||||||
art.autoSize = false;
|
art.autoSize = false;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreen', true);
|
art.emit('fullscreen', true);
|
||||||
|
notice.show = '';
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
screenfull.exit().then(function () {
|
screenfull.exit().then(function () {
|
||||||
@@ -1633,6 +1635,7 @@
|
|||||||
art.autoSize = art.option.autoSize;
|
art.autoSize = art.option.autoSize;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreen');
|
art.emit('fullscreen');
|
||||||
|
notice.show = '';
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1640,7 +1643,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
var webkitScreenfull = function webkitScreenfull(art) {
|
var webkitScreenfull = function webkitScreenfull(art) {
|
||||||
var $video = art.template.$video;
|
var notice = art.notice,
|
||||||
|
$video = art.template.$video;
|
||||||
def(art, 'fullscreen', {
|
def(art, 'fullscreen', {
|
||||||
get: function get() {
|
get: function get() {
|
||||||
return $video.webkitDisplayingFullscreen;
|
return $video.webkitDisplayingFullscreen;
|
||||||
@@ -1649,9 +1653,11 @@
|
|||||||
if (value) {
|
if (value) {
|
||||||
$video.webkitEnterFullscreen();
|
$video.webkitEnterFullscreen();
|
||||||
art.emit('fullscreen', true);
|
art.emit('fullscreen', true);
|
||||||
|
notice.show = '';
|
||||||
} else {
|
} else {
|
||||||
$video.webkitExitFullscreen();
|
$video.webkitExitFullscreen();
|
||||||
art.emit('fullscreen');
|
art.emit('fullscreen');
|
||||||
|
notice.show = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -1683,7 +1689,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function fullscreenWebMix(art) {
|
function fullscreenWebMix(art) {
|
||||||
var $player = art.template.$player;
|
var notice = art.notice,
|
||||||
|
$player = art.template.$player;
|
||||||
def(art, 'fullscreenWeb', {
|
def(art, 'fullscreenWeb', {
|
||||||
get: function get() {
|
get: function get() {
|
||||||
return hasClass($player, 'art-fullscreen-web');
|
return hasClass($player, 'art-fullscreen-web');
|
||||||
@@ -1695,12 +1702,14 @@
|
|||||||
art.autoSize = false;
|
art.autoSize = false;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreenWeb', true);
|
art.emit('fullscreenWeb', true);
|
||||||
|
notice.show = '';
|
||||||
} else {
|
} else {
|
||||||
removeClass($player, 'art-fullscreen-web');
|
removeClass($player, 'art-fullscreen-web');
|
||||||
art.aspectRatioReset = true;
|
art.aspectRatioReset = true;
|
||||||
art.autoSize = art.option.autoSize;
|
art.autoSize = art.option.autoSize;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreenWeb');
|
art.emit('fullscreenWeb');
|
||||||
|
notice.show = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -3841,13 +3850,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function resizeInit(art, events) {
|
function resizeInit(art, events) {
|
||||||
var option = art.option;
|
var notice = art.notice,
|
||||||
|
option = art.option;
|
||||||
var resizeFn = throttle(function () {
|
var resizeFn = throttle(function () {
|
||||||
if (art.normalSize) {
|
if (art.normalSize) {
|
||||||
art.autoSize = option.autoSize;
|
art.autoSize = option.autoSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
art.aspectRatioReset = true;
|
art.aspectRatioReset = true;
|
||||||
|
notice.show = '';
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
}, 500);
|
}, 500);
|
||||||
events.proxy(window, ['orientationchange', 'resize'], function () {
|
events.proxy(window, ['orientationchange', 'resize'], function () {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrMix.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@5.0.2@screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/autoHeightMix.js","../../packages/artplayer/src/player/themeMix.js","../../packages/artplayer/src/player/titleMix.js","../../packages/artplayer/src/player/exclusiveMix.js","../../packages/artplayer/src/player/subtitleOffsetMix.js","../../packages/artplayer/src/player/optionInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplLine truncated
|
{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrMix.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@5.0.2@screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/autoHeightMix.js","../../packages/artplayer/src/player/themeMix.js","../../packages/artplayer/src/player/titleMix.js","../../packages/artplayer/src/player/exclusiveMix.js","../../packages/artplayer/src/player/subtitleOffsetMix.js","../../packages/artplayer/src/player/optionInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.16.3@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplLine truncated
|
||||||
@@ -1,13 +1,14 @@
|
|||||||
import { throttle } from '../utils';
|
import { throttle } from '../utils';
|
||||||
|
|
||||||
export default function resizeInit(art, events) {
|
export default function resizeInit(art, events) {
|
||||||
const { option } = art;
|
const { notice, option } = art;
|
||||||
|
|
||||||
const resizeFn = throttle(() => {
|
const resizeFn = throttle(() => {
|
||||||
if (art.normalSize) {
|
if (art.normalSize) {
|
||||||
art.autoSize = option.autoSize;
|
art.autoSize = option.autoSize;
|
||||||
}
|
}
|
||||||
art.aspectRatioReset = true;
|
art.aspectRatioReset = true;
|
||||||
|
notice.show = '';
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
}, 500);
|
}, 500);
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,10 @@ import screenfull from 'screenfull';
|
|||||||
import { addClass, removeClass, def, get } from '../utils';
|
import { addClass, removeClass, def, get } from '../utils';
|
||||||
|
|
||||||
const nativeScreenfull = (art) => {
|
const nativeScreenfull = (art) => {
|
||||||
const { $player } = art.template;
|
const {
|
||||||
|
notice,
|
||||||
|
template: { $player },
|
||||||
|
} = art;
|
||||||
|
|
||||||
screenfull.on('change', () => art.emit('fullscreen', screenfull.isFullscreen));
|
screenfull.on('change', () => art.emit('fullscreen', screenfull.isFullscreen));
|
||||||
|
|
||||||
@@ -18,6 +21,7 @@ const nativeScreenfull = (art) => {
|
|||||||
art.autoSize = false;
|
art.autoSize = false;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreen', true);
|
art.emit('fullscreen', true);
|
||||||
|
notice.show = '';
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
screenfull.exit().then(() => {
|
screenfull.exit().then(() => {
|
||||||
@@ -26,6 +30,7 @@ const nativeScreenfull = (art) => {
|
|||||||
art.autoSize = art.option.autoSize;
|
art.autoSize = art.option.autoSize;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreen');
|
art.emit('fullscreen');
|
||||||
|
notice.show = '';
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -33,7 +38,10 @@ const nativeScreenfull = (art) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const webkitScreenfull = (art) => {
|
const webkitScreenfull = (art) => {
|
||||||
const { $video } = art.template;
|
const {
|
||||||
|
notice,
|
||||||
|
template: { $video },
|
||||||
|
} = art;
|
||||||
|
|
||||||
def(art, 'fullscreen', {
|
def(art, 'fullscreen', {
|
||||||
get() {
|
get() {
|
||||||
@@ -43,9 +51,11 @@ const webkitScreenfull = (art) => {
|
|||||||
if (value) {
|
if (value) {
|
||||||
$video.webkitEnterFullscreen();
|
$video.webkitEnterFullscreen();
|
||||||
art.emit('fullscreen', true);
|
art.emit('fullscreen', true);
|
||||||
|
notice.show = '';
|
||||||
} else {
|
} else {
|
||||||
$video.webkitExitFullscreen();
|
$video.webkitExitFullscreen();
|
||||||
art.emit('fullscreen');
|
art.emit('fullscreen');
|
||||||
|
notice.show = '';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import { addClass, removeClass, hasClass, def } from '../utils';
|
import { addClass, removeClass, hasClass, def } from '../utils';
|
||||||
|
|
||||||
export default function fullscreenWebMix(art) {
|
export default function fullscreenWebMix(art) {
|
||||||
const { $player } = art.template;
|
const {
|
||||||
|
notice,
|
||||||
|
template: { $player },
|
||||||
|
} = art;
|
||||||
|
|
||||||
def(art, 'fullscreenWeb', {
|
def(art, 'fullscreenWeb', {
|
||||||
get() {
|
get() {
|
||||||
@@ -14,12 +17,14 @@ export default function fullscreenWebMix(art) {
|
|||||||
art.autoSize = false;
|
art.autoSize = false;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreenWeb', true);
|
art.emit('fullscreenWeb', true);
|
||||||
|
notice.show = '';
|
||||||
} else {
|
} else {
|
||||||
removeClass($player, 'art-fullscreen-web');
|
removeClass($player, 'art-fullscreen-web');
|
||||||
art.aspectRatioReset = true;
|
art.aspectRatioReset = true;
|
||||||
art.autoSize = art.option.autoSize;
|
art.autoSize = art.option.autoSize;
|
||||||
art.emit('resize');
|
art.emit('resize');
|
||||||
art.emit('fullscreenWeb');
|
art.emit('fullscreenWeb');
|
||||||
|
notice.show = '';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user