aboutsummaryrefslogtreecommitdiffstats
path: root/src/js
diff options
context:
space:
mode:
authorSam <me@sampotts.me>2016-05-15 19:54:03 +1000
committerSam <me@sampotts.me>2016-05-15 19:54:03 +1000
commit0bceeb4674434dd33be2f84020d1edbe5b7cdaf6 (patch)
treea7f1ed3b18f23894926ec7ca1faefbf8899f2b78 /src/js
parent5a433f2fc8824046f9937fdc6e63db5e7b0ef87d (diff)
parentc86b824a04df35b73c4ee418dca1b73f775e1965 (diff)
downloadplyr-0bceeb4674434dd33be2f84020d1edbe5b7cdaf6.tar.lz
plyr-0bceeb4674434dd33be2f84020d1edbe5b7cdaf6.tar.xz
plyr-0bceeb4674434dd33be2f84020d1edbe5b7cdaf6.zip
Merge branch 'master' of https://github.com/Selz/plyr
# Conflicts: # dist/plyr.css # src/less/variables.less
Diffstat (limited to 'src/js')
-rw-r--r--src/js/plyr.js17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 832df4af..90fc8888 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v1.6.5
+// plyr.js v1.6.9
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@@ -2162,6 +2162,10 @@
// Update <progress> elements
function _updateProgress(event) {
+ if (!plyr.supported.full) {
+ return;
+ }
+
var progress = plyr.progress.played,
value = 0,
duration = _getDuration();
@@ -2209,9 +2213,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) {
@@ -2471,7 +2484,7 @@
_updateSeekDisplay();
// Reset buffer progress
- _setProgress(plyr.progress.buffer);
+ _setProgress();
// Cancel current network requests
_cancelRequests();