Merge branch 'develop' of https://github.com/sampotts/plyr into develop

This commit is contained in:
Sam Potts 2018-12-08 16:50:48 +11:00
commit b9ea9fba9a
2 changed files with 2 additions and 2 deletions

2
src/js/controls.js vendored
View File

@ -1587,7 +1587,7 @@ const controls = {
// If function, run it and use output // If function, run it and use output
if (is.function(this.config.controls)) { if (is.function(this.config.controls)) {
this.config.controls = this.config.controls.call(this.props); this.config.controls = this.config.controls.call(this, props);
} }
// Convert falsy controls to empty array (primarily for empty strings) // Convert falsy controls to empty array (primarily for empty strings)

View File

@ -42,13 +42,13 @@
&::-webkit-progress-bar { &::-webkit-progress-bar {
background: transparent; background: transparent;
transition: width 0.2s ease;
} }
&::-webkit-progress-value { &::-webkit-progress-value {
background: currentColor; background: currentColor;
border-radius: 100px; border-radius: 100px;
min-width: $plyr-range-track-height; min-width: $plyr-range-track-height;
transition: width 0.2s ease;
} }
// Mozilla // Mozilla