mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-24 14:41:20 -08:00
update ci
This commit is contained in:
1 parent
bf0f7bfcaa
commit
aba956d4a4
7 files changed
+28
-18
No files matched your search
+1
-1
@@ -5,7 +5,7 @@ node_js:
|
|||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- npm install
|
- npm install
|
||||||
- lerna run npm install
|
- npm i packages/* && lerna bootstrap --hoist
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- npm run lint
|
- npm run lint
|
||||||
@@ -1071,8 +1071,11 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
Object.defineProperty(player, 'mute', {
|
Object.defineProperty(player, 'mute', {
|
||||||
value: function value() {
|
get: function get() {
|
||||||
player.volume = 0;
|
return player.volume === 0;
|
||||||
|
},
|
||||||
|
set: function set(mute) {
|
||||||
|
player.volume = mute ? 0 : storage.get('volume');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -3600,10 +3603,10 @@
|
|||||||
_this.setVolumeHandle(player.volume);
|
_this.setVolumeHandle(player.volume);
|
||||||
});
|
});
|
||||||
proxy(this.$volume, 'click', function () {
|
proxy(this.$volume, 'click', function () {
|
||||||
player.volume = 0;
|
player.mute = true;
|
||||||
});
|
});
|
||||||
proxy(this.$volumeClose, 'click', function () {
|
proxy(this.$volumeClose, 'click', function () {
|
||||||
player.volume = storage.get('volume');
|
player.mute = false;
|
||||||
});
|
});
|
||||||
hover($control, function () {
|
hover($control, function () {
|
||||||
_this.$volumePanel.classList.add('art-volume-panel-hover');
|
_this.$volumePanel.classList.add('art-volume-panel-hover');
|
||||||
@@ -4562,7 +4565,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mousemoveInitInit(art, events) {
|
function mousemoveInitInit(art, events) {
|
||||||
var $player = art.refs.$player;
|
var _art$refs = art.refs,
|
||||||
|
$player = _art$refs.$player,
|
||||||
|
$video = _art$refs.$video;
|
||||||
var autoHide = debounce(function () {
|
var autoHide = debounce(function () {
|
||||||
$player.classList.add('artplayer-hide-cursor');
|
$player.classList.add('artplayer-hide-cursor');
|
||||||
$player.classList.remove('artplayer-hover');
|
$player.classList.remove('artplayer-hover');
|
||||||
@@ -4573,12 +4578,12 @@
|
|||||||
autoHide();
|
autoHide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
events.proxy($player, 'mousemove', function () {
|
events.proxy($player, 'mousemove', function (event) {
|
||||||
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 && event.target === $video) {
|
||||||
autoHide();
|
autoHide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"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
|
{"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
|
||||||
+6
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "artplayer",
|
"name": "artplayer-packages",
|
||||||
"version": "1.0.2",
|
"version": "1.0.0",
|
||||||
"description": "ArtPlayer is a modern HTML5 video player",
|
"description": "ArtPlayer is a modern HTML5 video player",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"bootstrap": "lerna bootstrap",
|
"bootstrap": "lerna bootstrap",
|
||||||
@@ -30,5 +30,9 @@
|
|||||||
"eslint-config-prettier": "^3.3.0",
|
"eslint-config-prettier": "^3.3.0",
|
||||||
"eslint-plugin-import": "^2.14.0",
|
"eslint-plugin-import": "^2.14.0",
|
||||||
"lerna": "^3.4.3"
|
"lerna": "^3.4.3"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"artplayer": "file:packages/artplayer",
|
||||||
|
"artplayer-plugin-danmu": "file:packages/artplayer-plugin-danmu"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -36,11 +36,11 @@ export default class Volume {
|
|||||||
});
|
});
|
||||||
|
|
||||||
proxy(this.$volume, 'click', () => {
|
proxy(this.$volume, 'click', () => {
|
||||||
player.volume = 0;
|
player.mute = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
proxy(this.$volumeClose, 'click', () => {
|
proxy(this.$volumeClose, 'click', () => {
|
||||||
player.volume = storage.get('volume');
|
player.mute = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
hover(
|
hover(
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { debounce } from '../utils';
|
|||||||
|
|
||||||
export default function mousemoveInitInit(art, events) {
|
export default function mousemoveInitInit(art, events) {
|
||||||
const {
|
const {
|
||||||
refs: { $player },
|
refs: { $player, $video },
|
||||||
} = art;
|
} = art;
|
||||||
|
|
||||||
const autoHide = debounce(() => {
|
const autoHide = debounce(() => {
|
||||||
@@ -17,11 +17,11 @@ export default function mousemoveInitInit(art, events) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
events.proxy($player, 'mousemove', () => {
|
events.proxy($player, 'mousemove', event => {
|
||||||
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 && event.target === $video) {
|
||||||
autoHide();
|
autoHide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -23,8 +23,9 @@ export default function volumeMix(art, player) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
Object.defineProperty(player, 'mute', {
|
Object.defineProperty(player, 'mute', {
|
||||||
value: () => {
|
get: () => player.volume === 0,
|
||||||
player.volume = 0;
|
set: mute => {
|
||||||
|
player.volume = mute ? 0 : storage.get('volume');
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user