ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for promise issue on Chrome, loading fix

Browse Source
This commit is contained in:
Sam 2017-12-27 21:40:35 +00:00
parent 965fc0b2f5
commit 6b9106ddb1
7 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,4 +4,5 @@ aws.json
*.mp4 *.mp4
!dist/blank.mp4 !dist/blank.mp4
index-*.html index-*.html
npm-debug.log npm-debug.log
*.webm

2
demo/dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.js.map vendored
View File

File diff suppressed because one or more lines are too long

16
src/js/plyr.js
View File

@ -283,7 +283,11 @@ class Plyr {
* Pause the media * Pause the media
*/ */
pause() { pause() {
return this.media.pause(); if (!this.playing) {
return;
}
this.media.pause();
} }
/** /**
@ -309,11 +313,13 @@ class Plyr {
/** /**
* Toggle playback based on current status * Toggle playback based on current status
* @param {boolean} toggle * @param {boolean} input
*/ */
togglePlay(toggle) { togglePlay(input) {
// True toggle if nothing passed // Toggle based on current state if nothing passed
if ((!utils.is.boolean(toggle) && this.media.paused) || toggle) { const toggle = utils.is.boolean(input) ? input : !this.playing;
if (toggle) {
this.play(); this.play();
} else { } else {
this.pause(); this.pause();

5
src/sass/settings/progress.scss
View File

@ -2,7 +2,10 @@
// Progress // Progress
// ========================================================================== // ==========================================================================
// Loading
$plyr-progress-loading-size: 25px !default; $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-video-progress-buffered-bg: rgba(#fff, 0.25) !default;
$plyr-audio-progress-buffered-bg: rgba($plyr-color-heather, 0.66) !default; $plyr-audio-progress-buffered-bg: rgba($plyr-color-heather, 0.66) !default;