From a17cbb0e8b6e0b2d8fe482f4262bde040dc3e98c Mon Sep 17 00:00:00 2001 From: Darren Anderson Date: Thu, 6 Oct 2016 15:33:49 +0100 Subject: Added .isPaused to API --- src/js/plyr.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/js/plyr.js b/src/js/plyr.js index 18099312..1d2cc4f0 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -3400,6 +3400,7 @@ isMuted: function() { return plyr.media.muted; }, isReady: function() { return _hasClass(plyr.container, config.classes.ready); }, isLoading: function() { return _hasClass(plyr.container, config.classes.loading); }, + isPaused: function() { return plyr.media.paused; }, on: function(event, callback) { _on(plyr.container, event, callback); }, play: _play, pause: _pause, -- cgit v1.2.3 From f428c3ff8b2bd0cb212f91d456597dc62fcff53b Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 23 Oct 2016 12:19:39 +1100 Subject: Manually merged #395 --- src/js/plyr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/js/plyr.js b/src/js/plyr.js index 1d2cc4f0..73389bf2 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -3401,7 +3401,7 @@ isReady: function() { return _hasClass(plyr.container, config.classes.ready); }, isLoading: function() { return _hasClass(plyr.container, config.classes.loading); }, isPaused: function() { return plyr.media.paused; }, - on: function(event, callback) { _on(plyr.container, event, callback); }, + on: function(event, callback) { _on(plyr.container, event, callback); return this; }, play: _play, pause: _pause, stop: function() { _pause(); _seek(); }, -- cgit v1.2.3 From bec10e7836295b955128a76b1c1cd1d381cde272 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 23 Oct 2016 13:35:49 +1100 Subject: Fix for caption size (fixes #390), Fix for Firefox Dev (fixes #392) --- src/less/plyr.less | 16 ++++++++++------ src/less/variables.less | 3 ++- src/scss/plyr.scss | 15 +++++++++------ src/scss/variables.scss | 3 ++- 4 files changed, 23 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/less/plyr.less b/src/less/plyr.less index f70d135c..143e7f06 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -173,9 +173,6 @@ position: relative; background: #000; border-radius: inherit; - - // Cleaner radius, also forces iframe radius - -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC); } // Container for embeds @@ -184,6 +181,9 @@ height: 0; overflow: hidden; + // Require z-index to force border-radius + z-index: 0; + iframe { position: absolute; top: 0; @@ -192,6 +192,7 @@ height: 100%; border: 0; user-select: none; + z-index: 1; } // Vimeo hack @@ -244,12 +245,15 @@ .plyr--captions-active .plyr__captions { display: block; } -.plyr--fullscreen-active .plyr__captions { - font-size: @plyr-font-size-captions-large; -} .plyr--hide-controls .plyr__captions { transform: translateY(-(@plyr-control-spacing * 1.5)); } +// Large captions in full screen on larger screens +@media (min-width: @plyr-bp-screen-lg) { + .plyr--fullscreen-active .plyr__captions { + font-size: @plyr-font-size-captions-large; + } +} // Controls // -------------------------------------------------------------- diff --git a/src/less/variables.less b/src/less/variables.less index fc9e895a..807d0854 100644 --- a/src/less/variables.less +++ b/src/less/variables.less @@ -68,4 +68,5 @@ // Breakpoints @plyr-bp-screen-sm: 480px; -@plyr-bp-screen-md: 768px; \ No newline at end of file +@plyr-bp-screen-md: 768px; +@plyr-bp-screen-lg: 1024px; \ No newline at end of file diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss index 47917364..70518591 100644 --- a/src/scss/plyr.scss +++ b/src/scss/plyr.scss @@ -172,9 +172,6 @@ position: relative; background: #000; border-radius: inherit; - - // Cleaner radius, also forces iframe radius - -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC); } // Container for embeds @@ -184,6 +181,9 @@ overflow: hidden; border-radius: inherit; + // Require z-index to force border-radius + z-index: 0; + iframe { position: absolute; top: 0; @@ -244,12 +244,15 @@ .plyr--captions-active .plyr__captions { display: block; } -.plyr--fullscreen-active .plyr__captions { - font-size: $plyr-font-size-captions-large; -} .plyr--hide-controls .plyr__captions { transform: translateY(-($plyr-control-spacing * 2)); } +// Large captions in full screen on larger screens +@media (min-width: $plyr-bp-screen-lg) { + .plyr--fullscreen-active .plyr__captions { + font-size: $plyr-font-size-captions-large; + } +} // Controls // -------------------------------------------------------------- diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 0bd31603..da75f11a 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -69,4 +69,5 @@ $plyr-range-selected-bg: $plyr-color-main !default; // Breakpoints $plyr-bp-screen-sm: 480px !default; -$plyr-bp-screen-md: 768px !default; \ No newline at end of file +$plyr-bp-screen-md: 768px !default; +$plyr-bp-screen-lg: 1024px !default; \ No newline at end of file -- cgit v1.2.3 From a509a5e1bc6a1ada4e56e326f01396292821bf27 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 23 Oct 2016 13:48:05 +1100 Subject: v2.0.8 - Added `isPaused()` API method (thanks to @darrena092) - Allowed `.on()` API method to be chainable (thanks to @gurupras) (fixes #357) - Improved the "awful" rendering of captions on small screens in fullscreen mode (fixes #390) - Fix for Firefox VTT compatibility (thanks to @magourex) - Fix for Firefox Developer Edition blank video due to `-webkit-mask-image` issue (fixes #392) - Added Issue and PR templates with the aim of reducing duplicate or duff issues --- src/js/plyr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/js/plyr.js b/src/js/plyr.js index 73389bf2..703aee9c 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v2.0.7 +// plyr.js v2.0.8 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -43,7 +43,7 @@ displayDuration: true, loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/2.0.7/plyr.svg', + iconUrl: 'https://cdn.plyr.io/2.0.8/plyr.svg', clickToPlay: true, hideControls: true, showPosterOnEnd: false, -- cgit v1.2.3 From 08b4c09b896e1ad27c7a7f974e98831eec294019 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 23 Oct 2016 15:18:08 +1100 Subject: Temporary patch for the YouTube API issues with `getDuration()` (relates to #374) --- src/js/plyr.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/js/plyr.js b/src/js/plyr.js index 703aee9c..c2e3a621 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1737,6 +1737,14 @@ _triggerEvent(plyr.media, 'timeupdate'); }, 100); + // Check duration again due to YouTube bug + // https://github.com/Selz/plyr/issues/374 + // https://code.google.com/p/gdata-issues/issues/detail?id=8690 + if (plyr.media.duration !== instance.getDuration()) { + plyr.media.duration = instance.getDuration(); + _triggerEvent(plyr.media, 'durationchange'); + } + break; case 2: -- cgit v1.2.3 From a3ed3093429d5306a89566215207d42a476392d8 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 23 Oct 2016 15:18:53 +1100 Subject: v2.0.9 - Temporary patch for the YouTube API issues with `getDuration()` (relates to #374) --- src/js/plyr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/js/plyr.js b/src/js/plyr.js index c2e3a621..dd14f767 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v2.0.8 +// plyr.js v2.0.9 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -43,7 +43,7 @@ displayDuration: true, loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/2.0.8/plyr.svg', + iconUrl: 'https://cdn.plyr.io/2.0.9/plyr.svg', clickToPlay: true, hideControls: true, showPosterOnEnd: false, -- cgit v1.2.3