ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' into beta-with-ads

Browse Source 
# Conflicts:
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	dist/plyr.js
#	dist/plyr.js.map
This commit is contained in:
Sam Potts
2018-01-14 22:55:44 +11:00
parent bbdf225d7b 5f96ec6ac2
commit cfc86bcb7c
6 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/ui.js
View File

@ -345,13 +345,16 @@ const ui = {
return;
}
// If there's a spot to display duration
const hasDuration = utils.is.element(this.elements.display.duration);
// If there's only one time display, display duration there
if (!utils.is.element(this.elements.display.duration) && this.config.displayDuration && this.paused) {
if (!hasDuration && this.config.displayDuration && this.paused) {
ui.updateTimeDisplay.call(this, this.elements.display.currentTime, this.duration);
}
// If there's a duration element, update content
if (utils.is.element(this.elements.display.duration)) {
if (hasDuration) {
ui.updateTimeDisplay.call(this, this.elements.display.duration, this.duration);
}