diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/plyr.js | 41 | ||||
| -rw-r--r-- | src/less/plyr.less | 8 | ||||
| -rw-r--r-- | src/less/variables.less | 2 |
3 files changed, 32 insertions, 19 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index cdc6ad20..48cd1e2f 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -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) // ========================================================================== @@ -488,7 +488,7 @@ // Removed call to arguments.callee (used explicit function name instead) function _extend() { // Get arguments - var objects = arguments; + var objects = arguments; // Bail if nothing to merge if(!objects.length) { @@ -598,14 +598,14 @@ var storage = { supported: (function() { if(!('localStorage' in window)) { - return false; - } + return false; + } - // Try to use it (it might be disabled, e.g. user is in private/porn mode) + // Try to use it (it might be disabled, e.g. user is in private/porn mode) // see: https://github.com/Selz/plyr/issues/131 - try { + try { // Add test item - window.localStorage.setItem('___test', 'OK'); + window.localStorage.setItem('___test', 'OK'); // Get the test item var result = window.localStorage.getItem('___test'); @@ -615,12 +615,12 @@ // Check if value matches return (result === 'OK'); - } - catch (e) { - return false; - } + } + catch (e) { + return false; + } - return false; + return false; })() }; return storage; @@ -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; diff --git a/src/less/plyr.less b/src/less/plyr.less index e1d89e8e..3d203e98 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -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; diff --git a/src/less/variables.less b/src/less/variables.less index cac8a088..0b1c8541 100644 --- a/src/less/variables.less +++ b/src/less/variables.less @@ -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; |