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

Tidying up, Vimeo fix

Browse Source
This commit is contained in:
Sam Potts 2016-01-18 17:35:18 +11:00
parent dbe152a4c1
commit 2e5bdb338e
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

9
src/js/plyr.js
View File

@ -1646,7 +1646,8 @@
break; break;
case 'vimeo': case 'vimeo':
plyr.embed.api('seekTo', targetTime); // Round to nearest second for vimeo
plyr.embed.api('seekTo', targetTime.toFixed(0));
break; break;
} }
@ -2214,8 +2215,8 @@
} }
// Determine which buttons // Determine which buttons
var trigger = plyr.buttons[play ? "play" : "pause"], var trigger = plyr.buttons[play ? 'play' : 'pause'],
target = plyr.buttons[play ? "pause" : "play"]; target = plyr.buttons[play ? 'pause' : 'play'];
// Setup focus and tab focus // Setup focus and tab focus
if(target) { if(target) {
@ -2475,7 +2476,7 @@
function _setupInterface() { function _setupInterface() {
// Don't setup interface if no support // Don't setup interface if no support
if (!plyr.supported.full) { if (!plyr.supported.full) {
_log("No full support for this media type (" + plyr.type + ")", true); _log('No full support for this media type (' + plyr.type + ')', true);
// Remove controls // Remove controls
_remove(_getElement(config.selectors.controls.wrapper)); _remove(_getElement(config.selectors.controls.wrapper));

15
src/less/plyr.less
View File

@ -599,7 +599,7 @@
} }
// Full screen mode // Full screen mode
&--fullscreen, &.plyr--fullscreen,
&--fullscreen-active { &--fullscreen-active {
position: fixed; position: fixed;
top: 0; top: 0;
@ -627,24 +627,25 @@
} }
// Hide controls when playing in full screen // Hide controls when playing in full screen
&--fullscreen--hide-controls&--fullscreen-active&--playing { &--fullscreen-active.plyr--fullscreen--hide-controls.plyr--playing,
&.plyr--fullscreen.plyr--fullscreen--hide-controls.plyr--playing {
.plyr__controls { .plyr__controls {
transform: translateY(100%) translateY(@plyr-control-spacing / 2); transform: translateY(100%) translateY(@plyr-control-spacing / 2);
transition: transform .3s .2s ease; transition: transform .3s .2s ease;
} }
&.plyr--hover .plyr__controls {
transform: translateY(0);
}
.plyr__captions { .plyr__captions {
bottom: (@plyr-control-spacing / 2); bottom: (@plyr-control-spacing / 2);
transition: bottom .3s .2s ease; transition: bottom .3s .2s ease;
} }
&.plyr--hover .plyr__controls {
transform: translateY(0);
}
} }
// Captions // Captions
&--fullscreen .plyr__captions, &.plyr--fullscreen .plyr__captions,
&--fullscreen-active .plyr__captions, &--fullscreen-active .plyr__captions,
&--fullscreen--hide-controls&--fullscreen-active&--playing&--hover &__captions { &--fullscreen--hide-controls.plyr--fullscreen-active.plyr--playing.plyr--hover .plyr__captions {
top: auto; top: auto;
bottom: 90px; bottom: 90px;

13
src/sass/plyr.scss
View File

@ -626,24 +626,25 @@ $plyr-bp-captions-large: 768px !default; // When captions jump to the la
} }
// Hide controls when playing in full screen // Hide controls when playing in full screen
&--fullscreen--hide-controls&--fullscreen-active&--playing { &--fullscreen-active.plyr--fullscreen--hide-controls.plyr--playing,
&.plyr--fullscreen.plyr--fullscreen--hide-controls.plyr--playing {
.plyr__controls { .plyr__controls {
transform: translateY(100%) translateY($plyr-control-spacing / 2); transform: translateY(100%) translateY($plyr-control-spacing / 2);
transition: transform .3s .2s ease; transition: transform .3s .2s ease;
} }
&.plyr--hover .plyr__controls {
transform: translateY(0);
}
.plyr__captions { .plyr__captions {
bottom: ($plyr-control-spacing / 2); bottom: ($plyr-control-spacing / 2);
transition: bottom .3s .2s ease; transition: bottom .3s .2s ease;
} }
&.plyr--hover .plyr__controls {
transform: translateY(0);
}
} }
// Captions // Captions
&--fullscreen .plyr__captions, &.plyr--fullscreen .plyr__captions,
&--fullscreen-active .plyr__captions, &--fullscreen-active .plyr__captions,
&--fullscreen--hide-controls&--fullscreen-active&--playing&--hover &__captions { &--fullscreen--hide-controls.plyr--fullscreen-active.plyr--playing.plyr--hover .plyr__captions {
top: auto; top: auto;
bottom: 90px; bottom: 90px;