From ac0061b83e2c3387beaa74dbd92f3d6a60b26453 Mon Sep 17 00:00:00 2001
From: Sam Potts <me@sampotts.me>
Date: Thu, 19 May 2016 11:56:24 +1000
Subject: Bug fix for no buffer

---
 src/js/plyr.js     | 9 +++++++--
 src/less/plyr.less | 2 +-
 src/scss/plyr.scss | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/js/plyr.js b/src/js/plyr.js
index 825f13da..6f5b4aeb 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -2245,9 +2245,14 @@
             if (typeof value === 'undefined') {
                 value = 0;
             }
-            // Default to buffer
+            // Default to buffer or bail
             if (typeof progress === 'undefined') {
-                progress = plyr.progress.buffer;
+                if (plyr.progress && plyr.progress.buffer) {
+                    progress = plyr.progress.buffer;
+                }
+                else {
+                    return;
+                }
             }
 
             // One progress element passed
diff --git a/src/less/plyr.less b/src/less/plyr.less
index 467175a1..ca7b555a 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -375,7 +375,7 @@
     border-radius: 100%;
     box-shadow: 0 1px 1px fade(@plyr-video-controls-bg, 15%);
     color: @plyr-video-control-color;
-    transition: opacity .3s ease, visibility .3s ease;
+    transition: all .3s ease;
 
     svg {
         position: relative;
diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss
index d527a40e..c5e0bfaa 100644
--- a/src/scss/plyr.scss
+++ b/src/scss/plyr.scss
@@ -374,7 +374,7 @@
     border-radius: 100%;
     box-shadow: 0 1px 1px transparentize($plyr-video-controls-bg, .85);
     color: $plyr-video-control-color;
-    transition: opacity .3s ease, visibility .3s ease;
+    transition: all .3s ease;
 
     svg {
         position: relative;
-- 
cgit v1.2.3