From 1cc2930dc0b81183bc47442f5ad9b5d8df94cc5f Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 4 Nov 2017 14:25:28 +1100 Subject: ES6-ified --- demo/src/js/demo.js | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 demo/src/js/demo.js (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js new file mode 100644 index 00000000..eef49596 --- /dev/null +++ b/demo/src/js/demo.js @@ -0,0 +1,260 @@ +// ========================================================================== +// Plyr.io demo +// This code is purely for the https://plyr.io website +// Please see readme.md in the root or github.com/sampotts/plyr +// ========================================================================== + +document.addEventListener('DOMContentLoaded', () => { + if (window.shr) { + window.shr.setup({ + count: { + classname: 'button__count', + }, + }); + } + + // Setup tab focus + const tabClassName = 'tab-focus'; + + // Remove class on blur + document.addEventListener('focusout', event => { + event.target.classList.remove(tabClassName); + }); + + // Add classname to tabbed elements + document.addEventListener('keydown', event => { + if (event.keyCode !== 9) { + return; + } + + // Delay the adding of classname until the focus has changed + // This event fires before the focusin event + window.setTimeout(() => { + document.activeElement.classList.add(tabClassName); + }, 0); + }); + + /* document.body.addEventListener('ready', function(event) { + console.log(event); + }); */ + + // Setup the player + const player = new window.Plyr('#player', { + debug: true, + title: 'View From A Blue Moon', + iconUrl: '../dist/plyr.svg', + tooltips: { + controls: true, + }, + captions: { + active: true, + }, + controls: [ + 'play-large', + 'play', + 'progress', + 'current-time', + 'mute', + 'volume', + 'captions', + 'settings', + 'fullscreen', + 'pip', + 'airplay', + ], + }); + + // Expose for testing + window.player = player; + + // Setup type toggle + const buttons = document.querySelectorAll('[data-source]'); + const types = { + video: 'video', + audio: 'audio', + youtube: 'youtube', + vimeo: 'vimeo', + }; + let currentType = window.location.hash.replace('#', ''); + const historySupport = window.history && window.history.pushState; + + // Toggle class on an element + function toggleClass(element, className, state) { + if (element) { + element.classList[state ? 'add' : 'remove'](className); + } + } + + // 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)) { + return; + } + + switch (type) { + case types.video: + player.src = { + type: 'video', + title: 'View From A Blue Moon', + sources: [ + { + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.mp4', + type: 'video/mp4', + }, + ], + 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', + default: true, + }, + { + kind: 'captions', + label: 'French', + srclang: 'fr', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt', + }, + ], + }; + + break; + + case types.audio: + player.src = { + type: 'audio', + 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', + type: 'audio/mp3', + }, + { + src: 'https://cdn.plyr.io/static/demo/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg', + type: 'audio/ogg', + }, + ], + }; + + break; + + case types.youtube: + player.src = { + type: 'video', + title: 'View From A Blue Moon', + sources: [ + { + src: 'https://www.youtube.com/watch?v=bTqVqk7FSmY', + type: 'youtube', + }, + ], + }; + + break; + + case types.vimeo: + player.src = { + type: 'video', + title: 'View From A Blue Moon', + sources: [ + { + src: 'https://vimeo.com/76979871', + type: 'vimeo', + }, + ], + }; + + break; + + default: + break; + } + + // Set the current type for next time + currentType = type; + + // Remove active classes + Array.from(buttons).forEach(button => toggleClass(button.parentElement, 'active', false)); + + // Set active on parent + 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'); + } + + // Bind to each button + Array.from(buttons).forEach(button => { + button.addEventListener('click', () => { + const type = button.getAttribute('data-source'); + + newSource(type); + + if (historySupport) { + window.history.pushState({ type }, '', `#${type}`); + } + }); + }); + + // List for backwards/forwards + window.addEventListener('popstate', event => { + if (event.state && 'type' in event.state) { + newSource(event.state.type); + } + }); + + // On load + if (historySupport) { + const video = !currentType.length; + + // If there's no current type set, assume video + if (video) { + currentType = types.video; + } + + // Replace current history state + if (currentType in types) { + window.history.replaceState( + { + type: currentType, + }, + '', + video ? '' : `#${currentType}` + ); + } + + // If it's not video, load the source + if (currentType !== types.video) { + newSource(currentType, true); + } + } +}); + +// Google analytics +// For demo site (https://plyr.io) only +/* eslint-disable */ +if (window.location.host === 'plyr.io') { + (function(i, s, o, g, r, a, m) { + i.GoogleAnalyticsObject = r; + i[r] = + i[r] || + function() { + (i[r].q = i[r].q || []).push(arguments); + }; + i[r].l = 1 * new Date(); + a = s.createElement(o); + m = s.getElementsByTagName(o)[0]; + a.async = 1; + a.src = g; + m.parentNode.insertBefore(a, m); + })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); + window.ga('create', 'UA-40881672-11', 'auto'); + window.ga('send', 'pageview'); +} +/* eslint-enable */ -- cgit v1.2.3 From 9c4b7e70948af3a1e45b63b3d36f3cae86802919 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 6 Nov 2017 20:34:11 +1100 Subject: Keyboard logic --- demo/src/js/demo.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index eef49596..b8f19bdf 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -43,6 +43,9 @@ document.addEventListener('DOMContentLoaded', () => { debug: true, title: 'View From A Blue Moon', iconUrl: '../dist/plyr.svg', + keyboard: { + global: true, + }, tooltips: { controls: true, }, -- cgit v1.2.3 From 91712977643d4acc4bb83c6bb113bd564edcc5b1 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 10 Nov 2017 00:06:46 +1100 Subject: More docs --- demo/src/js/demo.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index b8f19bdf..f77ca6dd 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -97,7 +97,7 @@ document.addEventListener('DOMContentLoaded', () => { switch (type) { case types.video: - player.src = { + player.source = { type: 'video', title: 'View From A Blue Moon', sources: [ @@ -127,7 +127,7 @@ document.addEventListener('DOMContentLoaded', () => { break; case types.audio: - player.src = { + player.source = { type: 'audio', title: 'Kishi Bashi – “It All Began With A Burst”', sources: [ @@ -145,7 +145,7 @@ document.addEventListener('DOMContentLoaded', () => { break; case types.youtube: - player.src = { + player.source = { type: 'video', title: 'View From A Blue Moon', sources: [ @@ -159,7 +159,7 @@ document.addEventListener('DOMContentLoaded', () => { break; case types.vimeo: - player.src = { + player.source = { type: 'video', title: 'View From A Blue Moon', sources: [ -- cgit v1.2.3 From d7a1c4428138d2dd5af09e41e998d1e08dafe76e Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 16 Nov 2017 11:38:06 +0100 Subject: Using fetch instead of xhr, grabbing title for YouTube --- 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 f77ca6dd..a1fb7f4c 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -150,7 +150,7 @@ document.addEventListener('DOMContentLoaded', () => { title: 'View From A Blue Moon', sources: [ { - src: 'https://www.youtube.com/watch?v=bTqVqk7FSmY', + src: 'https://youtube.com/watch?v=bTqVqk7FSmY', type: 'youtube', }, ], @@ -161,7 +161,6 @@ document.addEventListener('DOMContentLoaded', () => { case types.vimeo: player.source = { type: 'video', - title: 'View From A Blue Moon', sources: [ { src: 'https://vimeo.com/76979871', -- cgit v1.2.3 From 6984d6fb1606a71edd35ac043ac1116b6de8e98b Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 18 Nov 2017 19:30:26 +1100 Subject: Controls cleanup, work on captions bug, click to invert time --- demo/src/js/demo.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index a1fb7f4c..7284250a 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -65,6 +65,9 @@ document.addEventListener('DOMContentLoaded', () => { 'pip', 'airplay', ], + keys: { + google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', + }, }); // Expose for testing @@ -102,24 +105,24 @@ document.addEventListener('DOMContentLoaded', () => { title: 'View From A Blue Moon', sources: [ { - src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.mp4', + src: 'media/View_From_A_Blue_Moon_Trailer-HD.mp4', type: 'video/mp4', }, ], - poster: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg', + poster: 'hmedia/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: 'media/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: 'media/View_From_A_Blue_Moon_Trailer-HD.fr.vtt', }, ], }; -- cgit v1.2.3 From 4b62a5c74dc5f67d0f12126f554df53f02541ef7 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 19 Nov 2017 17:54:38 +1100 Subject: Captions fix --- 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 7284250a..7c228304 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -109,7 +109,7 @@ document.addEventListener('DOMContentLoaded', () => { type: 'video/mp4', }, ], - poster: 'hmedia/View_From_A_Blue_Moon_Trailer-HD.jpg', + poster: 'media/View_From_A_Blue_Moon_Trailer-HD.jpg', tracks: [ { kind: 'captions', -- cgit v1.2.3 From 921cefd212f65290349aa1d9d533c95cb1f6fcce Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 23 Nov 2017 17:35:35 +1100 Subject: Moved to provider + type to make it cleaner in future, fix for multiple players --- demo/src/js/demo.js | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 7c228304..19f98047 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,19 +52,7 @@ document.addEventListener('DOMContentLoaded', () => { captions: { active: true, }, - controls: [ - 'play-large', - 'play', - 'progress', - 'current-time', - 'mute', - 'volume', - 'captions', - 'settings', - 'fullscreen', - 'pip', - 'airplay', - ], + controls: ['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'fullscreen', 'pip', 'airplay'], keys: { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, @@ -154,7 +142,7 @@ document.addEventListener('DOMContentLoaded', () => { sources: [ { src: 'https://youtube.com/watch?v=bTqVqk7FSmY', - type: 'youtube', + provider: 'youtube', }, ], }; @@ -167,7 +155,7 @@ document.addEventListener('DOMContentLoaded', () => { sources: [ { src: 'https://vimeo.com/76979871', - type: 'vimeo', + provider: 'vimeo', }, ], }; -- cgit v1.2.3 From c8990bd379d97f4eb14cc35aaa90caebfb7db220 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 8 Dec 2017 10:05:38 +0000 Subject: IE & Edge fixes, Storage & Console classes --- demo/src/js/demo.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 19f98047..e032e38f 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -34,10 +34,6 @@ document.addEventListener('DOMContentLoaded', () => { }, 0); }); - /* document.body.addEventListener('ready', function(event) { - console.log(event); - }); */ - // Setup the player const player = new window.Plyr('#player', { debug: true, -- cgit v1.2.3 From 965fc0b2f5a377f16c8521b57e8667358b9ca38d Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 23 Dec 2017 18:42:52 +0000 Subject: Docs, restored loadSprite and supported static methods --- demo/src/js/demo.js | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index e032e38f..ee52dfd8 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -48,7 +48,19 @@ document.addEventListener('DOMContentLoaded', () => { captions: { active: true, }, - controls: ['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'fullscreen', 'pip', 'airplay'], + controls: [ + 'play-large', + 'play', + 'progress', + 'current-time', + 'mute', + 'volume', + 'captions', + 'settings', + 'fullscreen', + 'pip', + 'airplay', + ], keys: { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, @@ -87,12 +99,10 @@ document.addEventListener('DOMContentLoaded', () => { player.source = { type: 'video', title: 'View From A Blue Moon', - sources: [ - { - src: 'media/View_From_A_Blue_Moon_Trailer-HD.mp4', - type: 'video/mp4', - }, - ], + sources: [{ + src: 'media/View_From_A_Blue_Moon_Trailer-HD.mp4', + type: 'video/mp4', + }], poster: 'media/View_From_A_Blue_Moon_Trailer-HD.jpg', tracks: [ { @@ -135,12 +145,10 @@ document.addEventListener('DOMContentLoaded', () => { player.source = { type: 'video', title: 'View From A Blue Moon', - sources: [ - { - src: 'https://youtube.com/watch?v=bTqVqk7FSmY', - provider: 'youtube', - }, - ], + sources: [{ + src: 'https://youtube.com/watch?v=bTqVqk7FSmY', + provider: 'youtube', + }], }; break; @@ -148,12 +156,10 @@ document.addEventListener('DOMContentLoaded', () => { 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 6fd7b26bb2b0d1961a8b5844792f51adc6074cbc Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 9 Jan 2018 20:25:46 +1100 Subject: Beta version up on https://plyr.io/beta and CDN --- demo/src/js/demo.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index ee52dfd8..576bfd12 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -100,23 +100,23 @@ document.addEventListener('DOMContentLoaded', () => { type: 'video', title: 'View From A Blue Moon', sources: [{ - src: 'media/View_From_A_Blue_Moon_Trailer-HD.mp4', + src: 'https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.mp4', type: 'video/mp4', }], - poster: 'media/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: 'media/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: 'media/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', }, ], }; @@ -220,7 +220,7 @@ document.addEventListener('DOMContentLoaded', () => { type: currentType, }, '', - video ? '' : `#${currentType}` + video ? '' : `#${currentType}`, ); } -- cgit v1.2.3 From bbdf225d7b25c16d293108a9cf813c521f4d44eb Mon Sep 17 00:00:00 2001 From: ferdiemmen Date: Sun, 14 Jan 2018 08:21:35 +0100 Subject: Fix loading google ima sdk --- demo/src/js/demo.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 576bfd12..7adfa2d7 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -64,6 +64,9 @@ document.addEventListener('DOMContentLoaded', () => { keys: { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, + ads: { + adTagUrl: 'http://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', + }, }); // Expose for testing -- cgit v1.2.3 From 5f96ec6ac2765c176645651881fa2d0ba666f58b Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 14 Jan 2018 22:54:03 +1100 Subject: Minor logic tweak --- demo/src/js/demo.js | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 576bfd12..91649b6e 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -48,19 +48,6 @@ document.addEventListener('DOMContentLoaded', () => { captions: { active: true, }, - controls: [ - 'play-large', - 'play', - 'progress', - 'current-time', - 'mute', - 'volume', - 'captions', - 'settings', - 'fullscreen', - 'pip', - 'airplay', - ], keys: { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, -- cgit v1.2.3 From 22e8892993b995f50c15d49558081e1271ac6bca Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 14 Jan 2018 23:15:33 +1100 Subject: Code tweaks --- demo/src/js/demo.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 8db7910c..d20cecdb 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,7 +52,8 @@ document.addEventListener('DOMContentLoaded', () => { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - adTagUrl: 'http://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', + tagUrl: + 'http://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', }, }); -- cgit v1.2.3 From 4b0005c28eaab460be1b4f5f22fa5d1f3ffae522 Mon Sep 17 00:00:00 2001 From: Arthur Hulsman Date: Mon, 15 Jan 2018 14:47:34 +0100 Subject: Added promises, missing events, new ad tag and additional logging. --- demo/src/js/demo.js | 8 ++++++-- 1 file changed, 6 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 d20cecdb..b8650896 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,8 +52,12 @@ document.addEventListener('DOMContentLoaded', () => { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - tagUrl: - 'http://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', + tagUrl: 'https://pubads.g.doubleclick.net/gampad/ads' + + '?sz=640x480&iu=/124319096/external/ad_rule_samples&' + + 'ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&' + + 'output=vmap&unviewed_position_start=1&cust_params=d' + + 'eployment%3Ddevsite%26sample_ar%3Dpremidpostoptimiz' + + 'edpod&cmsid=496&vid=short_onecue&correlator=', }, }); -- cgit v1.2.3 From ec73d34bd3061c2b512dda97765e4f38db4619c3 Mon Sep 17 00:00:00 2001 From: ferdiemmen Date: Tue, 16 Jan 2018 23:06:40 +0100 Subject: Some tweaks --- demo/src/js/demo.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index b8650896..17b0999e 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,12 +52,7 @@ document.addEventListener('DOMContentLoaded', () => { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - tagUrl: 'https://pubads.g.doubleclick.net/gampad/ads' + - '?sz=640x480&iu=/124319096/external/ad_rule_samples&' + - 'ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&' + - 'output=vmap&unviewed_position_start=1&cust_params=d' + - 'eployment%3Ddevsite%26sample_ar%3Dpremidpostoptimiz' + - 'edpod&cmsid=496&vid=short_onecue&correlator=', + tagUrl: 'http://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', }, }); -- cgit v1.2.3 From ebf53d14b12c025b6c2f37a887a55e2bf7ab3b7d Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 22 Jan 2018 23:39:09 +1100 Subject: Small tweaks --- demo/src/js/demo.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 17b0999e..fb215ed0 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,7 +52,8 @@ document.addEventListener('DOMContentLoaded', () => { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - tagUrl: 'http://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', + tagUrl: + 'https://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', }, }); -- cgit v1.2.3 From cc128e60888468a90dd73c90f05fc7ddbf104551 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 23 Jan 2018 10:31:21 +1100 Subject: Renamed property, UI tweak --- demo/src/js/demo.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index fb215ed0..164cfe7d 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,8 +52,11 @@ document.addEventListener('DOMContentLoaded', () => { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - tagUrl: + tag: 'https://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', + // Test tags + // tag: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/single_ad_samples&ciu_szs=300x250&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ct%3Dlinear&correlator=', + // tag: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator=', }, }); -- cgit v1.2.3 From 5e68f8c8ddd11070a2b2ee11339be8c2c37ed8a5 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 25 Jan 2018 22:41:30 +1100 Subject: Attempt to fix YouTube message error, added ads references, changes to bool --- demo/src/js/demo.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 164cfe7d..0fb06a11 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -52,11 +52,7 @@ document.addEventListener('DOMContentLoaded', () => { google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - tag: - 'https://go.aniview.com/api/adserver6/vast/?AV_PUBLISHERID=58c25bb0073ef448b1087ad6&AV_CHANNELID=5a0458dc28a06145e4519d21&AV_URL=127.0.0.1:3000&cb=1&AV_WIDTH=640&AV_HEIGHT=480', - // Test tags - // tag: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/single_ad_samples&ciu_szs=300x250&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ct%3Dlinear&correlator=', - // tag: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator=', + enabled: true, }, }); -- cgit v1.2.3 From 1ee88cba16dbb85e7e1decb4d5e6a1191d73efad Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 5 Feb 2018 21:26:18 +1100 Subject: Testing fetch --- 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 0fb06a11..d608ec18 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -38,7 +38,7 @@ document.addEventListener('DOMContentLoaded', () => { const player = new window.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 2150c44036e13073c6f7f07343009b6373846bdf Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 6 Feb 2018 00:24:48 +1100 Subject: Added backwards compatibility for
embeds --- 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 d608ec18..a8603c0d 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -35,7 +35,7 @@ document.addEventListener('DOMContentLoaded', () => { }); // Setup the player - const player = new window.Plyr('#player', { + const player = new Plyr('#player', { debug: true, title: 'View From A Blue Moon', // iconUrl: '../dist/plyr.svg', -- cgit v1.2.3 From 317b08c703c94c5ce0e1d53603f4e1c9842df249 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 3 Mar 2018 23:06:12 +1100 Subject: Ready event fix, YouTube play event fix, docs update --- demo/src/js/demo.js | 4 ++-- 1 file changed, 2 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 a8603c0d..65b94bff 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -29,7 +29,7 @@ document.addEventListener('DOMContentLoaded', () => { // Delay the adding of classname until the focus has changed // This event fires before the focusin event - window.setTimeout(() => { + setTimeout(() => { document.activeElement.classList.add(tabClassName); }, 0); }); @@ -56,7 +56,7 @@ document.addEventListener('DOMContentLoaded', () => { }, }); - // Expose for testing + // Expose for tinkering in the console window.player = player; // Setup type toggle -- cgit v1.2.3 From 572b8a7aca6c4b4fea1a7f7d371915cbe151be3d Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 10 Mar 2018 23:32:48 +1100 Subject: Manually merged PRs --- demo/src/js/demo.js | 4 ++-- 1 file changed, 2 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 65b94bff..035f8f6d 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -38,7 +38,7 @@ document.addEventListener('DOMContentLoaded', () => { const player = new Plyr('#player', { debug: true, title: 'View From A Blue Moon', - // iconUrl: '../dist/plyr.svg', + iconUrl: '../dist/plyr.svg', keyboard: { global: true, }, @@ -238,7 +238,7 @@ if (window.location.host === 'plyr.io') { a.async = 1; a.src = g; m.parentNode.insertBefore(a, m); - })(window, document, 'script', '//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 e206edc1f6a09e6c2584e83a60d2632202545733 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 11 Mar 2018 02:03:35 +1100 Subject: Event listener fixes, loadScript promise, ads tweaks --- 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 035f8f6d..65d20ffd 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -53,6 +53,7 @@ document.addEventListener('DOMContentLoaded', () => { }, ads: { enabled: true, + publisherId: 'plyrio', }, }); -- cgit v1.2.3 From 1b13ddaa5479baa8100e953e5d0752e3bd8654ab Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 13 Mar 2018 21:42:01 +1100 Subject: Update ads --- demo/src/js/demo.js | 1 - 1 file changed, 1 deletion(-) (limited to 'demo/src/js/demo.js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 65d20ffd..035f8f6d 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -53,7 +53,6 @@ document.addEventListener('DOMContentLoaded', () => { }, ads: { enabled: true, - publisherId: 'plyrio', }, }); -- cgit v1.2.3 From 5db73b13276bf50357cc98896421318de66ab042 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 17 Mar 2018 23:27:40 +1100 Subject: Added buffered getter --- 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 035f8f6d..5808cc7e 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -53,6 +53,7 @@ document.addEventListener('DOMContentLoaded', () => { }, ads: { enabled: true, + publisherId: '918848828995742', }, }); -- cgit v1.2.3