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

Merge branch 'master' of github.com:selz/plyr

Browse Source
This commit is contained in:
Sam Potts 2015-08-08 11:14:19 +10:00
commit 12a737a49e
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/plyr.js
View File

@ -912,10 +912,11 @@
iv_load_policy: 3, iv_load_policy: 3,
cc_lang_pref: "en", cc_lang_pref: "en",
wmode: "transparent", wmode: "transparent",
modestbranding: 1 modestbranding: 1,
disablekb: 1
}, },
events: { events: {
onReady: function(event) { 'onReady': function(event) {
// Get the instance // Get the instance
var instance = event.target; var instance = event.target;
@ -960,7 +961,7 @@
} }
} }
}, },
onStateChange: function(event) { 'onStateChange': function(event) {
// Get the instance // Get the instance
var instance = event.target; var instance = event.target;
@ -1253,7 +1254,7 @@
// YouTube // YouTube
if(player.type == "youtube") { if(player.type == "youtube") {
player.embed.seekTo(player.media.currentTime); player.embed.seekTo(targetTime);
// Trigger timeupdate // Trigger timeupdate
_triggerEvent(player.media, "timeupdate"); _triggerEvent(player.media, "timeupdate");

31
src/sass/plyr.scss
View File

@ -22,29 +22,22 @@ $font-size-large: ceil(($font-size-base * 1.5)) !default;
// Controls // Controls
$control-spacing: 10px !default; $control-spacing: 10px !default;
$controls-bg: #fff !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 // Contrast
@mixin contrast-control-color($color: "") { @if lightness($controls-bg) >= 65% {
$control-color: null !global; $control-color: $gray-light;
@if lightness($color) >= 65% { } @else {
$control-color: $gray-light; $control-color: $gray-lighter;
} @else if(lightness($color) < 65%) {
$control-color: $gray-lighter;
}
} }
@mixin contrast-control-color-hover($color: "") { @if lightness($control-bg-hover) >= 65% {
$control-color-hover: null !global; $control-color-hover: $gray;
@if lightness($color) >= 65% { } @else {
$control-color-hover: $gray; $control-color-hover: #fff;
} @else if lightness($color) < 65% {
$control-color-hover: #fff;
}
} }
@include contrast-control-color($controls-bg);
@include contrast-control-color-hover($control-bg-hover);
// Tooltips // Tooltips
$tooltip-bg: $controls-bg !default; $tooltip-bg: $controls-bg !default;
$tooltip-color: $control-color !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-bg: rgba(red($gray), green($gray), blue($gray), .2) !default;
$progress-playing-bg: $blue !default; $progress-playing-bg: $blue !default;
$progress-buffered-bg: rgba(red($gray), green($gray), blue($gray), .25) !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; $progress-loading-bg: rgba(0,0,0, .15) !default;
// Volume // Volume