From 0c03accd417e31ad34f81b12f1e9febec6e6fc48 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 9 Jun 2018 12:04:53 +1000 Subject: Fix Sprite issue --- demo/src/js/demo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 003e85d5..581978ec 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -50,7 +50,7 @@ import Raven from 'raven-js'; const player = new Plyr('#player', { debug: true, title: 'View From A Blue Moon', - iconUrl: '../dist/plyr.svg', + // iconUrl: '../dist/plyr.svg', keyboard: { global: true, }, -- cgit v1.2.3 From 76bb299c68a6b5cc72729771aca2f0d51078ebc5 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 9 Jun 2018 12:05:37 +1000 Subject: Restore default --- demo/src/js/demo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 581978ec..003e85d5 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -50,7 +50,7 @@ import Raven from 'raven-js'; const player = new Plyr('#player', { debug: true, title: 'View From A Blue Moon', - // iconUrl: '../dist/plyr.svg', + iconUrl: '../dist/plyr.svg', keyboard: { global: true, }, -- cgit v1.2.3 From 8584f6a1db0eecff8ac2c8c332a837e8a309fbf9 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 18 Jun 2018 22:01:56 +1000 Subject: v3.3.14 --- demo/src/js/demo.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 003e85d5..fbf70f72 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -143,7 +143,11 @@ import Raven from 'raven-js'; // Set a new source function newSource(type, init) { // Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video - if (!(type in types) || (!init && type === currentType) || (!currentType.length && type === types.video)) { + if ( + !(type in types) || + (!init && type === currentType) || + (!currentType.length && type === types.video) + ) { return; } @@ -215,10 +219,12 @@ import Raven from 'raven-js'; case types.youtube: player.source = { type: 'video', - sources: [{ - src: 'https://youtube.com/watch?v=bTqVqk7FSmY', - provider: 'youtube', - }], + sources: [ + { + src: 'https://youtube.com/watch?v=bTqVqk7FSmY', + provider: 'youtube', + }, + ], }; break; @@ -226,10 +232,12 @@ import Raven from 'raven-js'; case types.vimeo: player.source = { type: 'video', - sources: [{ - src: 'https://vimeo.com/76979871', - provider: 'vimeo', - }], + sources: [ + { + src: 'https://vimeo.com/76979871', + provider: 'vimeo', + }, + ], }; break; -- cgit v1.2.3 From c99607c85a293a565aa4110a69d04a9e8e9450b6 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 29 Jun 2018 00:21:22 +1000 Subject: Linting, housekeeping, duration fix (fixes #1074) --- demo/src/js/demo.js | 1 + 1 file changed, 1 insertion(+) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index fbf70f72..c074d4fa 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -57,6 +57,7 @@ import Raven from 'raven-js'; tooltips: { controls: true, }, + clickToPlay: false, /* controls: [ 'play-large', 'restart', -- cgit v1.2.3 From e63ad7c74bd763043344fd2bd568a64e7ea18622 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 15 Jul 2018 19:23:28 +1000 Subject: Keyboard and focus improvements --- demo/src/js/demo.js | 85 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 22 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index c074d4fa..8892bad8 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -12,11 +12,16 @@ import Raven from 'raven-js'; // Raven / Sentry // For demo site (https://plyr.io) only if (isLive) { - Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install(); + Raven.config( + 'https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555', + ).install(); } document.addEventListener('DOMContentLoaded', () => { Raven.context(() => { + const selector = '#player'; + const container = document.getElementById('container'); + if (window.shr) { window.shr.setup({ count: { @@ -30,6 +35,9 @@ import Raven from 'raven-js'; // Remove class on blur document.addEventListener('focusout', event => { + if (container.contains(event.target)) { + return; + } event.target.classList.remove(tabClassName); }); @@ -42,12 +50,18 @@ import Raven from 'raven-js'; // Delay the adding of classname until the focus has changed // This event fires before the focusin event setTimeout(() => { - document.activeElement.classList.add(tabClassName); - }, 0); + const focused = document.activeElement; + + if (!focused || container.contains(focused)) { + return; + } + + focused.classList.add(tabClassName); + }, 10); }); // Setup the player - const player = new Plyr('#player', { + const player = new Plyr(selector, { debug: true, title: 'View From A Blue Moon', iconUrl: '../dist/plyr.svg', @@ -159,40 +173,47 @@ import Raven from 'raven-js'; title: 'View From A Blue Moon', sources: [ { - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4', + src: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4', type: 'video/mp4', size: 576, }, { - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4', + src: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4', type: 'video/mp4', size: 720, }, { - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4', + src: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4', type: 'video/mp4', size: 1080, }, { - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1440p.mp4', + src: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1440p.mp4', type: 'video/mp4', size: 1440, }, ], - poster: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg', + poster: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg', tracks: [ { kind: 'captions', label: 'English', srclang: 'en', - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt', + src: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt', default: true, }, { kind: 'captions', label: 'French', srclang: 'fr', - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt', + src: + 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt', }, ], }; @@ -202,14 +223,17 @@ import Raven from 'raven-js'; case types.audio: player.source = { type: 'audio', - title: 'Kishi Bashi – “It All Began With A Burst”', + title: + 'Kishi Bashi – “It All Began With A Burst”', sources: [ { - src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3', + src: + 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3', type: 'audio/mp3', }, { - src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg', + src: + 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg', type: 'audio/ogg', }, ], @@ -222,7 +246,8 @@ import Raven from 'raven-js'; type: 'video', sources: [ { - src: 'https://youtube.com/watch?v=bTqVqk7FSmY', + src: + 'https://youtube.com/watch?v=bTqVqk7FSmY', provider: 'youtube', }, ], @@ -251,16 +276,26 @@ import Raven from 'raven-js'; currentType = type; // Remove active classes - Array.from(buttons).forEach(button => toggleClass(button.parentElement, 'active', false)); + Array.from(buttons).forEach(button => + toggleClass(button.parentElement, 'active', false), + ); // Set active on parent - toggleClass(document.querySelector(`[data-source="${type}"]`), 'active', true); + toggleClass( + document.querySelector(`[data-source="${type}"]`), + 'active', + true, + ); // Show cite - Array.from(document.querySelectorAll('.plyr__cite')).forEach(cite => { - cite.setAttribute('hidden', ''); - }); - document.querySelector(`.plyr__cite--${type}`).removeAttribute('hidden'); + Array.from(document.querySelectorAll('.plyr__cite')).forEach( + cite => { + cite.setAttribute('hidden', ''); + }, + ); + document + .querySelector(`.plyr__cite--${type}`) + .removeAttribute('hidden'); } // Bind to each button @@ -328,7 +363,13 @@ import Raven from 'raven-js'; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m); - })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); + })( + window, + document, + 'script', + 'https://www.google-analytics.com/analytics.js', + 'ga', + ); window.ga('create', 'UA-40881672-11', 'auto'); window.ga('send', 'pageview'); } -- cgit v1.2.3 From 599b33e55fb4c0aec78cd0895bcd13f3fed12ad2 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 30 Jul 2018 01:13:12 +1000 Subject: Click to play fix, poster fix, iOS controls fixes --- demo/src/js/demo.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 8892bad8..ec18afaa 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -69,9 +69,10 @@ import Raven from 'raven-js'; global: true, }, tooltips: { - controls: true, + controls: false, + seek: false, }, - clickToPlay: false, + // clickToPlay: false, /* controls: [ 'play-large', 'restart', @@ -129,7 +130,7 @@ import Raven from 'raven-js'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - enabled: true, + // enabled: true, publisherId: '918848828995742', }, }); -- cgit v1.2.3 From 2371619486dbbbfdb0350923684e53963141a7af Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Wed, 1 Aug 2018 00:56:44 +1000 Subject: Linting --- demo/src/js/demo.js | 69 ++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 49 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index ec18afaa..8b00d82d 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -12,9 +12,7 @@ import Raven from 'raven-js'; // Raven / Sentry // For demo site (https://plyr.io) only if (isLive) { - Raven.config( - 'https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555', - ).install(); + Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install(); } document.addEventListener('DOMContentLoaded', () => { @@ -130,7 +128,7 @@ import Raven from 'raven-js'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - // enabled: true, + enabled: true, publisherId: '918848828995742', }, }); @@ -174,47 +172,40 @@ import Raven from 'raven-js'; title: 'View From A Blue Moon', sources: [ { - src: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4', type: 'video/mp4', size: 576, }, { - src: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4', type: 'video/mp4', size: 720, }, { - src: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4', type: 'video/mp4', size: 1080, }, { - src: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1440p.mp4', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1440p.mp4', type: 'video/mp4', size: 1440, }, ], - poster: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg', + poster: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg', tracks: [ { kind: 'captions', label: 'English', srclang: 'en', - src: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt', default: true, }, { kind: 'captions', label: 'French', srclang: 'fr', - src: - 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt', }, ], }; @@ -224,17 +215,14 @@ import Raven from 'raven-js'; case types.audio: player.source = { type: 'audio', - title: - 'Kishi Bashi – “It All Began With A Burst”', + title: 'Kishi Bashi – “It All Began With A Burst”', sources: [ { - src: - 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3', + src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3', type: 'audio/mp3', }, { - src: - 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg', + src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg', type: 'audio/ogg', }, ], @@ -247,8 +235,7 @@ import Raven from 'raven-js'; type: 'video', sources: [ { - src: - 'https://youtube.com/watch?v=bTqVqk7FSmY', + src: 'https://youtube.com/watch?v=bTqVqk7FSmY', provider: 'youtube', }, ], @@ -277,26 +264,16 @@ import Raven from 'raven-js'; currentType = type; // Remove active classes - Array.from(buttons).forEach(button => - toggleClass(button.parentElement, 'active', false), - ); + Array.from(buttons).forEach(button => toggleClass(button.parentElement, 'active', false)); // Set active on parent - toggleClass( - document.querySelector(`[data-source="${type}"]`), - 'active', - true, - ); + toggleClass(document.querySelector(`[data-source="${type}"]`), 'active', true); // Show cite - Array.from(document.querySelectorAll('.plyr__cite')).forEach( - cite => { - cite.setAttribute('hidden', ''); - }, - ); - document - .querySelector(`.plyr__cite--${type}`) - .removeAttribute('hidden'); + Array.from(document.querySelectorAll('.plyr__cite')).forEach(cite => { + cite.setAttribute('hidden', ''); + }); + document.querySelector(`.plyr__cite--${type}`).removeAttribute('hidden'); } // Bind to each button @@ -364,13 +341,7 @@ import Raven from 'raven-js'; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m); - })( - window, - document, - 'script', - 'https://www.google-analytics.com/analytics.js', - 'ga', - ); + })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); window.ga('create', 'UA-40881672-11', 'auto'); window.ga('send', 'pageview'); } -- cgit v1.2.3 From 0b44f2d897e9ef644de40871018c1cfd7b1496e5 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Wed, 1 Aug 2018 00:57:45 +1000 Subject: Demo config --- demo/src/js/demo.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 8b00d82d..58c40ec2 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -67,8 +67,7 @@ import Raven from 'raven-js'; global: true, }, tooltips: { - controls: false, - seek: false, + controls: true, }, // clickToPlay: false, /* controls: [ -- cgit v1.2.3 From e09058191352ccf38ee89dfe7934751780f8b4b9 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Wed, 1 Aug 2018 11:49:42 +1000 Subject: Ads on dev or prod only --- demo/src/js/demo.js | 75 ++++++++++------------------------------------------- 1 file changed, 14 insertions(+), 61 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 58c40ec2..605eded7 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -7,13 +7,11 @@ import Raven from 'raven-js'; (() => { - const isLive = window.location.host === 'plyr.io'; - - // Raven / Sentry - // For demo site (https://plyr.io) only - if (isLive) { - Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install(); - } + const { host } = window.location; + const env = { + prod: host === 'plyr.io', + dev: host === 'dev.plyr.io', + }; document.addEventListener('DOMContentLoaded', () => { Raven.context(() => { @@ -69,57 +67,6 @@ import Raven from 'raven-js'; tooltips: { controls: true, }, - // clickToPlay: false, - /* controls: [ - 'play-large', - 'restart', - 'rewind', - 'play', - 'fast-forward', - 'progress', - 'current-time', - 'duration', - 'mute', - 'volume', - 'captions', - 'settings', - 'pip', - 'airplay', - 'fullscreen', - ], */ - /* i18n: { - restart: '重新開始', - rewind: '快退{seektime}秒', - play: '播放', - pause: '暫停', - fastForward: '快進{seektime}秒', - seek: '尋求', - played: '發揮', - buffered: '緩衝的', - currentTime: '當前時間戳', - duration: '長短', - volume: '音量', - mute: '靜音', - unmute: '取消靜音', - enableCaptions: '開啟字幕', - disableCaptions: '關閉字幕', - enterFullscreen: '進入全螢幕', - exitFullscreen: '退出全螢幕', - frameTitle: '球員為{title}', - captions: '字幕', - settings: '設定', - speed: '速度', - normal: '正常', - quality: '質量', - loop: '循環', - start: 'Start', - end: 'End', - all: 'All', - reset: '重啟', - disabled: '殘', - enabled: '啟用', - advertisement: '廣告', - }, */ captions: { active: true, }, @@ -127,7 +74,7 @@ import Raven from 'raven-js'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - enabled: true, + enabled: env.prod || env.dev, publisherId: '918848828995742', }, }); @@ -323,11 +270,17 @@ import Raven from 'raven-js'; }); }); + // Raven / Sentry + // For demo site (https://plyr.io) only + if (env.prod) { + Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install(); + } + // Google analytics // For demo site (https://plyr.io) only /* eslint-disable */ - if (isLive) { - (function(i, s, o, g, r, a, m) { + if (env.prod) { + ((i, s, o, g, r, a, m) => { i.GoogleAnalyticsObject = r; i[r] = i[r] || -- cgit v1.2.3 From f6bc42c2bc26cd594bb272ab32bbd227b0d493b0 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 13 Aug 2018 23:03:08 +1000 Subject: Fix IE11 issue in demo --- demo/src/js/demo.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 605eded7..accd1371 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -31,9 +31,10 @@ import Raven from 'raven-js'; // Remove class on blur document.addEventListener('focusout', event => { - if (container.contains(event.target)) { + if (!event.target.classList || container.contains(event.target)) { return; } + event.target.classList.remove(tabClassName); }); @@ -48,7 +49,7 @@ import Raven from 'raven-js'; setTimeout(() => { const focused = document.activeElement; - if (!focused || container.contains(focused)) { + if (!focused || !focused.classList || container.contains(focused)) { return; } -- cgit v1.2.3