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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
This commit is contained in:
Sam Potts
2016-05-19 11:32:14 +10:00
parent 126f80ed78 72187a89dd
commit 0b7dc51bd1
33 changed files with 222 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.6.5
// plyr.js v1.6.11
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@ -41,7 +41,7 @@
volumeStep: 1,
duration: null,
displayDuration: true,
iconPrefix: 'icon',
iconPrefix: 'plyr',
iconUrl: '',
clickToPlay: true,
hideControls: true,
@ -2186,6 +2186,10 @@
// Update <progress> elements
function _updateProgress(event) {
if (!plyr.supported.full) {
return;
}
var progress = plyr.progress.played,
value = 0,
duration = _getDuration();
@ -2233,9 +2237,18 @@
// Set <progress> value
function _setProgress(progress, value) {
if (!plyr.supported.full) {
return;
}
// Default to 0
if (typeof value === 'undefined') {
value = 0;
}
// Default to buffer
if (typeof progress === 'undefined') {
progress = plyr.progress.buffer;
}
// One progress element passed
if (progress instanceof HTMLElement) {
@ -2495,7 +2508,7 @@
_updateSeekDisplay();
// Reset buffer progress
_setProgress(plyr.progress.buffer);
_setProgress();
// Cancel current network requests
_cancelRequests();