aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Potts <me@sampotts.me>2016-05-14 08:56:59 +1000
committerSam Potts <me@sampotts.me>2016-05-14 08:56:59 +1000
commitd2e9c61fd7aacdc8f91ceec800d9cdf1e7e49e74 (patch)
tree99a821874e0bdea5179fe141340d3238da50e365 /src
parent448c070898b243d047b4fe102ddb165af1b21554 (diff)
downloadplyr-d2e9c61fd7aacdc8f91ceec800d9cdf1e7e49e74.tar.lz
plyr-d2e9c61fd7aacdc8f91ceec800d9cdf1e7e49e74.tar.xz
plyr-d2e9c61fd7aacdc8f91ceec800d9cdf1e7e49e74.zip
iOS bug fixes (fixes #213)
Diffstat (limited to 'src')
-rw-r--r--src/js/plyr.js17
-rw-r--r--src/less/plyr.less13
-rw-r--r--src/scss/plyr.scss13
3 files changed, 37 insertions, 6 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index db9f8a77..d33726dc 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v1.6.6
+// plyr.js v1.6.7
// 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 progres === '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();
diff --git a/src/less/plyr.less b/src/less/plyr.less
index ee7d5b78..64a0eb85 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -364,6 +364,7 @@
// Large play button (video only)
.plyr__play-large {
+ display: none;
position: absolute;
top: 50%;
left: 50%;
@@ -389,6 +390,9 @@
outline: 1px dotted fade(@plyr-video-control-color, 50%);
}
}
+.plyr .plyr__play-large {
+ display: inline-block;
+}
.plyr--audio .plyr__play-large {
display: none;
}
@@ -481,7 +485,7 @@
// <progress> element
.plyr__progress {
position: relative;
- display: inline-block;
+ display: none;
flex: 1;
input[type="range"] {
@@ -504,6 +508,9 @@
left: 0;
}
}
+.plyr .plyr__progress {
+ display: inline-block;
+}
.plyr__progress--buffer,
.plyr__progress--played,
@@ -636,8 +643,10 @@
// Volume
// --------------------------------------------------------------
-.plyr .plyr__volume {
+.plyr__volume {
display: none;
+}
+.plyr .plyr__volume {
flex: 1;
position: relative;
diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss
index 7673efee..20b73206 100644
--- a/src/scss/plyr.scss
+++ b/src/scss/plyr.scss
@@ -363,6 +363,7 @@
// Large play button (video only)
.plyr__play-large {
+ display: none;
position: absolute;
top: 50%;
left: 50%;
@@ -388,6 +389,9 @@
outline: 1px dotted transparentize($plyr-video-control-color, .5);
}
}
+.plyr .plyr__play-large {
+ display: inline-block;
+}
.plyr--audio .plyr__play-large {
display: none;
}
@@ -479,8 +483,8 @@
// --------------------------------------------------------------
// <progress> element
.plyr__progress {
+ display: none;
position: relative;
- display: inline-block;
flex: 1;
input[type="range"] {
@@ -503,6 +507,9 @@
left: 0;
}
}
+.plyr .plyr__progress {
+ display: inline-block;
+}
.plyr__progress--buffer,
.plyr__progress--played,
@@ -635,8 +642,10 @@
// Volume
// --------------------------------------------------------------
-.plyr .plyr__volume {
+.plyr__volume {
display: none;
+}
+.plyr .plyr__volume {
flex: 1;
position: relative;