aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam <sam@potts.es>2017-12-27 21:40:35 +0000
committerSam <sam@potts.es>2017-12-27 21:40:35 +0000
commit6b9106ddb1416e59f2dde05039c7ebad15ee8fa7 (patch)
treed6a2027fc09ea6b82b6b17e6daad8bcc0889a85e /src
parent965fc0b2f5a377f16c8521b57e8667358b9ca38d (diff)
downloadplyr-6b9106ddb1416e59f2dde05039c7ebad15ee8fa7.tar.lz
plyr-6b9106ddb1416e59f2dde05039c7ebad15ee8fa7.tar.xz
plyr-6b9106ddb1416e59f2dde05039c7ebad15ee8fa7.zip
Fix for promise issue on Chrome, loading fix
Diffstat (limited to 'src')
-rw-r--r--src/js/plyr.js16
-rw-r--r--src/sass/settings/progress.scss5
2 files changed, 15 insertions, 6 deletions
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;