From e97b616811ef84fd7caffe758afd43d7b244a32d Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Wed, 5 Aug 2015 19:55:30 -0700 Subject: [PATCH 1/5] Fixed events are not fired in YouTube embed player --- src/js/plyr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/plyr.js b/src/js/plyr.js index 593a64b4..d3288287 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -915,7 +915,7 @@ modestbranding: 1 }, events: { - onReady: function(event) { + 'onReady': function(event) { // Get the instance var instance = event.target; @@ -960,7 +960,7 @@ } } }, - onStateChange: function(event) { + 'onStateChange': function(event) { // Get the instance var instance = event.target; From e1353096709a3cabbf56842d9dc2b52d20cd8a9e Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Wed, 5 Aug 2015 19:56:16 -0700 Subject: [PATCH 2/5] Fixed youtube video cannot seek before video started with controls --- src/js/plyr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/plyr.js b/src/js/plyr.js index d3288287..2b1ab613 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1253,7 +1253,7 @@ // YouTube if(player.type == "youtube") { - player.embed.seekTo(player.media.currentTime); + player.embed.seekTo(targetTime); // Trigger timeupdate _triggerEvent(player.media, "timeupdate"); From 5fcfd5fa4f56f657a53de24c20f8522c37241e0d Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Wed, 5 Aug 2015 20:09:05 -0700 Subject: [PATCH 3/5] Eliminated running try catch when player.type="youtube" --- src/js/plyr.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/js/plyr.js b/src/js/plyr.js index 2b1ab613..2bd83343 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1244,15 +1244,16 @@ targetTime = player.media.duration; } - // Set the current time - // Try/catch incase the media isn't set and we're calling seek() from source() and IE moans - try { - player.media.currentTime = targetTime.toFixed(1); - } - catch(e) {} - + // Set the current time + if(player.type == "video" || player.type == "audio") { + // Try/catch incase the media isn't set and we're calling seek() from source() and IE moans + try { + player.media.currentTime = targetTime.toFixed(1); + } + catch(e) {} + } // YouTube - if(player.type == "youtube") { + else if(player.type == "youtube") { player.embed.seekTo(targetTime); // Trigger timeupdate From 9f1e5a55f43eae1d46828d0ea3c5a0396dfd6523 Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Wed, 5 Aug 2015 20:33:04 -0700 Subject: [PATCH 4/5] Disabled YouTube embed player keyboard control to match with plyr's control --- src/js/plyr.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/plyr.js b/src/js/plyr.js index 2bd83343..982023bb 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -912,7 +912,8 @@ iv_load_policy: 3, cc_lang_pref: "en", wmode: "transparent", - modestbranding: 1 + modestbranding: 1, + disablekb: 1 }, events: { 'onReady': function(event) { From f983f0771b8c0c2a15e65abc9ebac5cccc2b2bbe Mon Sep 17 00:00:00 2001 From: Calvin Tam Date: Wed, 5 Aug 2015 20:36:48 -0700 Subject: [PATCH 5/5] Revert "Eliminated running try catch when player.type="youtube"" This reverts commit 5fcfd5fa4f56f657a53de24c20f8522c37241e0d. --- src/js/plyr.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/js/plyr.js b/src/js/plyr.js index 982023bb..782e6397 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1245,16 +1245,15 @@ targetTime = player.media.duration; } - // Set the current time - if(player.type == "video" || player.type == "audio") { - // Try/catch incase the media isn't set and we're calling seek() from source() and IE moans - try { - player.media.currentTime = targetTime.toFixed(1); - } - catch(e) {} - } + // Set the current time + // Try/catch incase the media isn't set and we're calling seek() from source() and IE moans + try { + player.media.currentTime = targetTime.toFixed(1); + } + catch(e) {} + // YouTube - else if(player.type == "youtube") { + if(player.type == "youtube") { player.embed.seekTo(targetTime); // Trigger timeupdate