From cd9cbfbd1ecc50ebe463e1a9876c86478bc12b8f Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 8 Jan 2019 23:34:44 +1100 Subject: Enable thumbs in demo --- demo/src/js/demo.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index accd1371..e4dabde6 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -78,6 +78,13 @@ import Raven from 'raven-js'; enabled: env.prod || env.dev, publisherId: '918848828995742', }, + previewThumbnails: { + enabled: true, + src: [ + 'https://cdn.plyr.io/static/demo/thumbs/100p.vtt', + 'https://cdn.plyr.io/static/demo/thumbs/240p.vtt', + ], + }, }); // Expose for tinkering in the console -- cgit v1.2.3 From f927d26ce7150a12422a28e0c32edbb399632571 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 17 Jan 2019 11:37:19 +1100 Subject: v3.4.8 - Calling customized controls function with proper arguments (thanks @a60814billy) --- demo/src/js/demo.js | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index accd1371..21afa87e 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -279,24 +279,12 @@ import Raven from 'raven-js'; // Google analytics // For demo site (https://plyr.io) only - /* eslint-disable */ if (env.prod) { - ((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', 'https://www.google-analytics.com/analytics.js', 'ga'); - window.ga('create', 'UA-40881672-11', 'auto'); - window.ga('send', 'pageview'); + window.dataLayer = window.dataLayer || []; + const gtag = (...args) => { + window.dataLayer.push(args); + }; + gtag('js', new Date()); + gtag('config', 'UA-132699580-1'); } - /* eslint-enable */ })(); -- cgit v1.2.3 From e40c63b9e7985f52c7e68f5cb6aeaef9ff5ca9d7 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 17 Jan 2019 12:08:25 +1100 Subject: Fix GA --- demo/src/js/demo.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 21afa87e..927962d8 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -281,9 +281,7 @@ import Raven from 'raven-js'; // For demo site (https://plyr.io) only if (env.prod) { window.dataLayer = window.dataLayer || []; - const gtag = (...args) => { - window.dataLayer.push(args); - }; + const gtag = () => window.dataLayer.push(arguments); // eslint-disable-line gtag('js', new Date()); gtag('config', 'UA-132699580-1'); } -- cgit v1.2.3 From ad72ebd4bbf487e56884d264a4bb13119fb687b5 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 17 Jan 2019 18:50:26 +1100 Subject: Fix analytics --- demo/src/js/demo.js | 9 --------- 1 file changed, 9 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 927962d8..df5f6947 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -276,13 +276,4 @@ import Raven from 'raven-js'; if (env.prod) { Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install(); } - - // Google analytics - // For demo site (https://plyr.io) only - if (env.prod) { - window.dataLayer = window.dataLayer || []; - const gtag = () => window.dataLayer.push(arguments); // eslint-disable-line - gtag('js', new Date()); - gtag('config', 'UA-132699580-1'); - } })(); -- cgit v1.2.3 From 052e426810d504a01beb05c8bb34f83e190a0679 Mon Sep 17 00:00:00 2001 From: Christian Gambardella Date: Thu, 24 Jan 2019 12:07:01 +0100 Subject: Adds options for vimeo plugin #1316 This adds replaces hard coded vimeo options with options that can be passed to the Plyr instance when initializing. --- demo/src/js/demo.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index e4dabde6..7cc22434 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -85,6 +85,9 @@ import Raven from 'raven-js'; 'https://cdn.plyr.io/static/demo/thumbs/240p.vtt', ], }, + vimeo: { + transparent: true, + }, }); // Expose for tinkering in the console -- cgit v1.2.3 From c44351507f0a06578a1fee10185117e7df64ece9 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 26 Jan 2019 16:31:47 +1100 Subject: Plugin tweaks for ads and previews --- demo/src/js/demo.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index e4dabde6..314155f2 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -75,8 +75,10 @@ import Raven from 'raven-js'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - enabled: env.prod || env.dev, + enabled: true, // env.prod || env.dev, publisherId: '918848828995742', + tagUrl: + 'https://pubads.g.doubleclick.net/gampad/live/ads?sz=640x360&iu=/21736521837/ovo/web&impl=s&gdfp_req=1&env=vp&output=vast&cust_params=usergroup%3Dannon%26content-type%3Don-demand&cmsid=2490180&vid=3788', }, previewThumbnails: { enabled: true, -- cgit v1.2.3 From 24319e5c3132787d137d1d0fd7dc717227710e96 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 26 Jan 2019 16:35:34 +1100 Subject: Clean up --- demo/src/js/demo.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 314155f2..e4dabde6 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -75,10 +75,8 @@ import Raven from 'raven-js'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - enabled: true, // env.prod || env.dev, + enabled: env.prod || env.dev, publisherId: '918848828995742', - tagUrl: - 'https://pubads.g.doubleclick.net/gampad/live/ads?sz=640x360&iu=/21736521837/ovo/web&impl=s&gdfp_req=1&env=vp&output=vast&cust_params=usergroup%3Dannon%26content-type%3Don-demand&cmsid=2490180&vid=3788', }, previewThumbnails: { enabled: true, -- cgit v1.2.3 From 1d51b287014697701b78c883f70c9963f4253d3c Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 26 Jan 2019 22:45:47 +1100 Subject: Tweaks --- demo/src/js/demo.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 5df96208..8520615a 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -85,9 +85,6 @@ import Raven from 'raven-js'; 'https://cdn.plyr.io/static/demo/thumbs/240p.vtt', ], }, - vimeo: { - transparent: true, - }, }); // Expose for tinkering in the console -- cgit v1.2.3 From c125c1a2c019adc9077a7eb875d7daf0b89ad0a2 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 27 Jan 2019 01:08:39 +1100 Subject: Added ES builds --- demo/src/js/demo.js | 1 + 1 file changed, 1 insertion(+) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 8520615a..11650438 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -5,6 +5,7 @@ // ========================================================================== import Raven from 'raven-js'; +import Plyr from '../../../src/js/plyr'; (() => { const { host } = window.location; -- cgit v1.2.3 From 6bf6c3f0f482f59cb1a40c90cf5f859a5b0d11b8 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 27 Jan 2019 01:15:54 +1100 Subject: Paths --- demo/src/js/demo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 11650438..add123e5 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -62,7 +62,7 @@ import Plyr from '../../../src/js/plyr'; const player = new Plyr(selector, { debug: true, title: 'View From A Blue Moon', - iconUrl: '../dist/plyr.svg', + iconUrl: 'dist/plyr.svg', keyboard: { global: true, }, -- cgit v1.2.3 From eb628c8e4f109bb6aa4dc9196ee8f075092b225e Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 1 Feb 2019 00:24:48 +1100 Subject: Ads bug fixes --- demo/src/js/demo.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index add123e5..dd4b3b5d 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -58,6 +58,13 @@ import Plyr from '../../../src/js/plyr'; }, 10); }); + const userType = 'annon'; + const contentType = 'on-demand'; + const cmsid = 2490180; + const vid = 3788; + + const tagUrl = `https://pubads.g.doubleclick.net/gampad/live/ads?sz=640x360&iu=/21736521837/ovo/web&impl=s&gdfp_req=1&env=vp&output=vast&cust_params=usergroup%3D${userType}%26content-type%3D${contentType}&cmsid=${cmsid}&vid=${vid}`; + // Setup the player const player = new Plyr(selector, { debug: true, @@ -76,8 +83,8 @@ import Plyr from '../../../src/js/plyr'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - enabled: env.prod || env.dev, - publisherId: '918848828995742', + enabled: true, // env.prod || env.dev, + tagUrl, }, previewThumbnails: { enabled: true, -- cgit v1.2.3 From 153b8dc6bb96fdba8340a523c8828a72a832fcdf Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 19 Feb 2019 00:19:25 +1100 Subject: Added RangeTouch, updated Shr lib in demo --- demo/src/js/demo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index dd4b3b5d..02200cdc 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -19,8 +19,8 @@ import Plyr from '../../../src/js/plyr'; const selector = '#player'; const container = document.getElementById('container'); - if (window.shr) { - window.shr.setup({ + if (window.Shr) { + window.Shr.setup('.js-shr-button', { count: { classname: 'button__count', }, -- cgit v1.2.3 From 54110f83582e3c6d12ee7ba3f09e4b116be87ffd Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 19 Feb 2019 01:05:59 +1100 Subject: Update build process --- demo/src/js/demo.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'demo/src/js') diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 02200cdc..afe3c0dc 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -58,18 +58,11 @@ import Plyr from '../../../src/js/plyr'; }, 10); }); - const userType = 'annon'; - const contentType = 'on-demand'; - const cmsid = 2490180; - const vid = 3788; - - const tagUrl = `https://pubads.g.doubleclick.net/gampad/live/ads?sz=640x360&iu=/21736521837/ovo/web&impl=s&gdfp_req=1&env=vp&output=vast&cust_params=usergroup%3D${userType}%26content-type%3D${contentType}&cmsid=${cmsid}&vid=${vid}`; - // Setup the player const player = new Plyr(selector, { debug: true, title: 'View From A Blue Moon', - iconUrl: 'dist/plyr.svg', + iconUrl: 'dist/demo.svg', keyboard: { global: true, }, @@ -83,8 +76,8 @@ import Plyr from '../../../src/js/plyr'; google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c', }, ads: { - enabled: true, // env.prod || env.dev, - tagUrl, + enabled: env.prod || env.dev, + publisherId: '918848828995742', }, previewThumbnails: { enabled: true, -- cgit v1.2.3