From e07c8254e07c452815cca1560add1c70d3504ecf Mon Sep 17 00:00:00 2001 From: Micooz Date: Fri, 22 Sep 2017 11:39:54 +0800 Subject: [PATCH 1/3] utils: add getter/setter for scroll position, add browser detectors for firefox/chrome --- src/utils.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/utils.js b/src/utils.js index 2f56c6a..cb74b10 100644 --- a/src/utils.js +++ b/src/utils.js @@ -36,11 +36,32 @@ module.exports = { return actualLeft - elementScrollLeft; }, + getScrollPosition () { + return { + left: window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0, + top: window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0 + }; + }, + + setScrollPosition ({left = 0, top = 0}) { + if (this.isFirefox) { + document.documentElement.scrollLeft = left; + document.documentElement.scrollTop = top; + } + else { + window.scrollTo(left, top); + } + }, + /** * check if user is using mobile or not */ isMobile: /mobile/i.test(window.navigator.userAgent), + isFirefox: /firefox/i.test(window.navigator.userAgent), + + isChrome: /chrome/i.test(window.navigator.userAgent), + storage: { set: (key, value) => { localStorage.setItem(key, value); From c7a7e6c51954b341fa02df26a5245341249fe233 Mon Sep 17 00:00:00 2001 From: Micooz Date: Fri, 22 Sep 2017 11:40:35 +0800 Subject: [PATCH 2/3] src: add a patch class ".dplayer-web-fullscreen-fix" --- src/DPlayer.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/DPlayer.scss b/src/DPlayer.scss index 55416fd..a0660dc 100644 --- a/src/DPlayer.scss +++ b/src/DPlayer.scss @@ -1261,4 +1261,13 @@ [data-balloon][data-balloon-pos="up"]:after { margin-bottom: 0; -} \ No newline at end of file +} + +// To hide scroll bar, apply this class to +.dplayer-web-fullscreen-fix { + position: fixed; + top: 0; + left: 0; + margin: 0; + padding: 0; +} From 1d44769eeea0ea3ef68692de726568d4d72cc70c Mon Sep 17 00:00:00 2001 From: Micooz Date: Fri, 22 Sep 2017 11:42:10 +0800 Subject: [PATCH 3/3] src: hide scrollbars after fullscreen, also consider scroll position --- src/fullscreen.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/fullscreen.js b/src/fullscreen.js index bb69b2f..3af79a6 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -1,3 +1,5 @@ +import utils from './utils'; + class FullScreen { constructor (player) { this.player = player; @@ -50,6 +52,11 @@ class FullScreen { break; case 'web': this.player.container.classList.add('dplayer-fulled'); + + // record last position then hide scrollbars + this.lastScrollPosition = utils.getScrollPosition(); + document.body.classList.add('dplayer-web-fullscreen-fix'); + this.player.events.trigger('webfullscreen'); break; } @@ -70,6 +77,11 @@ class FullScreen { break; case 'web': this.player.container.classList.remove('dplayer-fulled'); + + // restore scrollbars and last position + document.body.classList.remove('dplayer-web-fullscreen-fix'); + utils.setScrollPosition(this.lastScrollPosition); + this.player.events.trigger('webfullscreen_cancel'); break; }