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

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

Browse Source 
# Conflicts:
#	dist/plyr.css
This commit is contained in:
Sam Potts
2016-04-28 18:35:21 +10:00
parent 85600ef685 f7edd84125
commit 4719766843
5 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/plyr.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

19
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.5.21
// plyr.js v1.6.0
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@ -2135,7 +2135,7 @@
// Update hover tooltip for seeking
function _updateSeekTooltip(event) {
// Bail if setting not true
if (!config.tooltips.seek || plyr.browser.touch) {
if (!config.tooltips.seek || plyr.browser.touch || !plyr.progress.container) {
return;
}
@ -2440,6 +2440,9 @@
if(target && target.length > 1) {
target = target[target.length - 1];
}
else {
target = target[0];
}
// Setup focus and tab focus
if(target) {
@ -2701,7 +2704,17 @@
plyr.browser = _browserSniff();
// Get the media element
plyr.media = plyr.container.querySelectorAll('audio, video, div')[0];
plyr.media = plyr.container.querySelectorAll('audio, video')[0];
// Get the div placeholder for YouTube and Vimeo
if(!plyr.media) {
plyr.media = plyr.container.querySelectorAll('div')[0];
}
// Bail if nothing to setup
if(!plyr.media) {
return;
}
// Get original classname
plyr.originalClassName = plyr.container.className;

8
src/less/plyr.less
View File

@ -18,7 +18,7 @@
.plyr {
position: relative;
max-width: 100%;
min-width: 290px;
min-width: 200px;
font-family: Avenir, "Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif;
// border-box everything
@ -92,7 +92,7 @@
}
&::-ms-fill-lower {
.plyr-range-track();
background: @plyr-progress-playing-bg;
background: @plyr-range-selected-bg;
}
&::-ms-thumb {
.plyr-range-thumb();
@ -361,7 +361,7 @@
transform: translate(-50%, -50%);
padding: @plyr-control-spacing;
background: @plyr-video-control-bg-hover;
border: 4px solid @plyr-video-control-color;
border: 4px solid currentColor;
border-radius: 100%;
box-shadow: 0 1px 1px fade(@plyr-video-controls-bg, 15%);
color: @plyr-video-control-color;
@ -535,7 +535,7 @@
.plyr__progress--played[value],
.plyr__volume--display[value] {
z-index: 1;
color: @plyr-progress-playing-bg;
color: @plyr-range-selected-bg;
background: transparent;
transition: none;

2
src/less/variables.less
View File

@ -40,7 +40,6 @@
@plyr-tooltip-radius: 3px;
// Progress
@plyr-progress-playing-bg: @plyr-color-main;
@plyr-progress-loading-size: 25px;
@plyr-progress-loading-bg: fade(#000, 15%);
@plyr-video-progress-bg: fade(#fff, 25%);
@ -60,6 +59,7 @@
@plyr-range-thumb-active-scale: 1.25;
@plyr-video-range-track-bg: @plyr-video-progress-buffered-bg;
@plyr-audio-range-track-bg: @plyr-audio-progress-buffered-bg;
@plyr-range-selected-bg: @plyr-color-main;
// Breakpoints
@plyr-bp-screen-sm: 480px;