From 6b9106ddb1416e59f2dde05039c7ebad15ee8fa7 Mon Sep 17 00:00:00 2001
From: Sam <sam@potts.es>
Date: Wed, 27 Dec 2017 21:40:35 +0000
Subject: Fix for promise issue on Chrome, loading fix

---
 src/js/plyr.js                  | 16 +++++++++++-----
 src/sass/settings/progress.scss |  5 ++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/js/plyr.js b/src/js/plyr.js
index e40097b0..7766cc47 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -283,7 +283,11 @@ class Plyr {
      * Pause the media
      */
     pause() {
-        return this.media.pause();
+        if (!this.playing) {
+            return;
+        }
+
+        this.media.pause();
     }
 
     /**
@@ -309,11 +313,13 @@ class Plyr {
 
     /**
      * Toggle playback based on current status
-     * @param {boolean} toggle
+     * @param {boolean} input
      */
-    togglePlay(toggle) {
-        // True toggle if nothing passed
-        if ((!utils.is.boolean(toggle) && this.media.paused) || toggle) {
+    togglePlay(input) {
+        // Toggle based on current state if nothing passed
+        const toggle = utils.is.boolean(input) ? input : !this.playing;
+
+        if (toggle) {
             this.play();
         } else {
             this.pause();
diff --git a/src/sass/settings/progress.scss b/src/sass/settings/progress.scss
index 2995f23a..074ee3c6 100644
--- a/src/sass/settings/progress.scss
+++ b/src/sass/settings/progress.scss
@@ -2,7 +2,10 @@
 // Progress
 // ==========================================================================
 
+// Loading
 $plyr-progress-loading-size: 25px !default;
-$plyr-progress-loading-bg: rgba($plyr-color-gunmetal, 0.2) !default;
+$plyr-progress-loading-bg: rgba($plyr-color-gunmetal, 0.6) !default;
+
+// Buffered
 $plyr-video-progress-buffered-bg: rgba(#fff, 0.25) !default;
 $plyr-audio-progress-buffered-bg: rgba($plyr-color-heather, 0.66) !default;
-- 
cgit v1.2.3