diff --git a/package.json b/package.json index 237c1f9..d048a22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dplayer", - "version": "1.21.0", + "version": "1.21.1", "description": "Wow, such a lovely HTML5 danmaku video player", "main": "dist/DPlayer.min.js", "style": "dist/DPlayer.min.css", diff --git a/src/css/player.scss b/src/css/player.scss index 761d896..6a5823a 100644 --- a/src/css/player.scss +++ b/src/css/player.scss @@ -140,15 +140,20 @@ width: 100%; height: 100%; } - &.dplayer-mobile .dplayer-controller .dplayer-icons { - .dplayer-volume, - .dplayer-camera-icon { - display: none; + &.dplayer-mobile { + .dplayer-controller .dplayer-icons { + .dplayer-volume, + .dplayer-camera-icon { + display: none; + } + .dplayer-full .dplayer-full-in-icon { + position: static; + display: inline-block; + } } - .dplayer-full .dplayer-full-in-icon { - position: static; - display: inline-block; + .dplayer-bar-time { + display: none; } } } diff --git a/src/js/controller.js b/src/js/controller.js index 972c4b7..aa6965b 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -105,6 +105,9 @@ class Controller { return; } const time = this.player.video.duration * (tx / this.player.template.playedBarWrap.offsetWidth); + if (utils.isMobile) { + this.thumbnails && this.thumbnails.show(); + } this.thumbnails && this.thumbnails.move(tx); this.player.template.playedBarTime.style.left = `${(tx - 20)}px`; this.player.template.playedBarTime.innerText = utils.secondToTime(time); @@ -112,19 +115,27 @@ class Controller { } }); - this.player.template.playedBarWrap.addEventListener('mouseenter', () => { - if (this.player.video.duration) { - this.thumbnails && this.thumbnails.show(); - this.player.template.playedBarTime.classList.remove('hidden'); + this.player.template.playedBarWrap.addEventListener(utils.nameMap.dragEnd, () => { + if (utils.isMobile) { + this.thumbnails && this.thumbnails.hide(); } }); - this.player.template.playedBarWrap.addEventListener('mouseleave', () => { - if (this.player.video.duration) { - this.thumbnails && this.thumbnails.hide(); - this.player.template.playedBarTime.classList.add('hidden'); - } - }); + if (!utils.isMobile) { + this.player.template.playedBarWrap.addEventListener('mouseenter', () => { + if (this.player.video.duration) { + this.thumbnails && this.thumbnails.show(); + this.player.template.playedBarTime.classList.remove('hidden'); + } + }); + + this.player.template.playedBarWrap.addEventListener('mouseleave', () => { + if (this.player.video.duration) { + this.thumbnails && this.thumbnails.hide(); + this.player.template.playedBarTime.classList.add('hidden'); + } + }); + } } initFullButton () {