aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/js/plyr.js9
-rw-r--r--src/sass/plyr.scss31
2 files changed, 17 insertions, 23 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 593a64b4..782e6397 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -912,10 +912,11 @@
iv_load_policy: 3,
cc_lang_pref: "en",
wmode: "transparent",
- modestbranding: 1
+ modestbranding: 1,
+ disablekb: 1
},
events: {
- onReady: function(event) {
+ 'onReady': function(event) {
// Get the instance
var instance = event.target;
@@ -960,7 +961,7 @@
}
}
},
- onStateChange: function(event) {
+ 'onStateChange': function(event) {
// Get the instance
var instance = event.target;
@@ -1253,7 +1254,7 @@
// YouTube
if(player.type == "youtube") {
- player.embed.seekTo(player.media.currentTime);
+ player.embed.seekTo(targetTime);
// Trigger timeupdate
_triggerEvent(player.media, "timeupdate");
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss
index bff8cd2e..a4dab010 100644
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@@ -22,29 +22,22 @@ $font-size-large: ceil(($font-size-base * 1.5)) !default;
// Controls
$control-spacing: 10px !default;
$controls-bg: #fff !default;
-$control-bg-hover: $blue !default; !default
+$control-bg-hover: $blue !default;
+$control-color: null !default;
+$control-color-hover: null !default;
// Contrast
-@mixin contrast-control-color($color: "") {
- $control-color: null !global;
- @if lightness($color) >= 65% {
- $control-color: $gray-light;
- } @else if(lightness($color) < 65%) {
- $control-color: $gray-lighter;
- }
+@if lightness($controls-bg) >= 65% {
+ $control-color: $gray-light;
+} @else {
+ $control-color: $gray-lighter;
}
-@mixin contrast-control-color-hover($color: "") {
- $control-color-hover: null !global;
- @if lightness($color) >= 65% {
- $control-color-hover: $gray;
- } @else if lightness($color) < 65% {
- $control-color-hover: #fff;
- }
+@if lightness($control-bg-hover) >= 65% {
+ $control-color-hover: $gray;
+} @else {
+ $control-color-hover: #fff;
}
-@include contrast-control-color($controls-bg);
-@include contrast-control-color-hover($control-bg-hover);
-
// Tooltips
$tooltip-bg: $controls-bg !default;
$tooltip-color: $control-color !default;
@@ -56,7 +49,7 @@ $tooltip-radius: 3px !default;
$progress-bg: rgba(red($gray), green($gray), blue($gray), .2) !default;
$progress-playing-bg: $blue !default;
$progress-buffered-bg: rgba(red($gray), green($gray), blue($gray), .25) !default;
-$progress-loading-size: 40px !default
+$progress-loading-size: 40px !default;
$progress-loading-bg: rgba(0,0,0, .15) !default;
// Volume