diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/plyr.js | 21 | ||||
| -rw-r--r-- | src/less/plyr.less | 17 | ||||
| -rw-r--r-- | src/sass/plyr.scss | 6 |
3 files changed, 31 insertions, 13 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 2cee1210..fce746db 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -172,7 +172,7 @@ // Seek tooltip if (config.tooltips.seek) { - html.push('<span class="plyr__tooltip">0:00</span>'); + html.push('<span class="plyr__tooltip">--:--</span>'); } // Close progress @@ -238,7 +238,7 @@ html.push( '<span class="plyr__time">', '<span class="plyr__sr-only">' + config.i18n.duration + '</span>', - '<span class="plyr__time--duration">00:00</span>', + '<span class="plyr__time--duration">--:--</span>', '</span>' ); } @@ -746,7 +746,7 @@ // Player instance function Plyr(container) { var plyr = this; - plyr.container = container, + plyr.container = container; plyr.timers = {}; // Captions functions @@ -1816,14 +1816,18 @@ function _setVolume(volume) { // Use default if no value specified if (typeof volume === 'undefined') { + volume = config.volume; + if (config.storage.enabled && _storage().supported) { - volume = window.localStorage[config.storage.key] || config.volume; - } - else { - volume = config.volume; + volume = window.localStorage.getItem(config.storage.key); } } + // Use config if all else fails + if(isNaN(volume)) { + volume = config.volume; + } + // Maximum is 10 if (volume > 10) { volume = 10; @@ -1873,7 +1877,7 @@ } // Store the volume in storage - if (config.storage.enabled && _storage().supported) { + if (config.storage.enabled && _storage().supported && !isNaN(volume)) { window.localStorage.setItem(config.storage.key, volume); } @@ -2015,6 +2019,7 @@ return; } + // Determine duration var duration = plyr.media.duration || 0; // If there's only one time display, display duration there diff --git a/src/less/plyr.less b/src/less/plyr.less index f480ed3f..73e14c56 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -181,7 +181,6 @@ height: 100%; border: 0; user-select: none; - pointer-events: none; // To allow mouse events to be captured } // Vimeo hack @@ -190,6 +189,11 @@ padding-bottom: 200%; transform: translateY(-35.95%); } + + // To allow mouse events to be captured if full support + &.plyr iframe { + pointer-events: none; + } } // Captions @@ -387,9 +391,14 @@ } // Common range styles - input[type='range'].tab-focus:focus { - outline: 1px dotted fade(@plyr-gray-dark, 80%); - outline-offset: 3px; + input[type='range'] { + &::-ms-tooltip { + display: none; + } + &.tab-focus:focus { + outline: 1px dotted fade(@plyr-gray-dark, 80%); + outline-offset: 3px; + } } // Playback progress diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss index 2f0193a8..f0d1df6f 100644 --- a/src/sass/plyr.scss +++ b/src/sass/plyr.scss @@ -180,7 +180,6 @@ $plyr-bp-captions-large: 768px !default; // When captions jump to the la height: 100%; border: 0; user-select: none; - pointer-events: none; // To allow mouse events to be captured } // Vimeo hack @@ -189,6 +188,11 @@ $plyr-bp-captions-large: 768px !default; // When captions jump to the la padding-bottom: 200%; transform: translateY(-35.95%); } + + // To allow mouse events to be captured if full support + &.plyr iframe { + pointer-events: none; + } } // Captions |