Youtube Iframe API update

#2081
chrisblakley · Oct 20, 2020 · b027752 · b027752
1 parent dbe06f8
commit b027752
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 13 deletions.
diff --git a/.github/package.json b/.github/package.json
@@ -2,7 +2,7 @@
 	"name": "nebula-wp",
 	"title": "Nebula",
 	"description": "Advanced Starter WordPress Theme for Developers",
-	"version": "8.5.18",
+	"version": "8.5.20",
 	"homepage": "https://gearside.com/nebula/",
 	"repository": {
 		"type": "git",

diff --git a/Nebula-Child/assets/css/admin.css b/Nebula-Child/assets/css/admin.css
diff --git a/Nebula-Child/resources/sw.js b/Nebula-Child/resources/sw.js
@@ -1,6 +1,6 @@
 //BEGIN automated edits. These will be automatically overwritten.
 const THEME_NAME = 'nebula-child';
-const NEBULA_VERSION = 'v8.5.18.5361'; //Sunday, October 18, 2020 12:52:05 PM
+const NEBULA_VERSION = 'v8.5.20.3575'; //Tuesday, October 20, 2020 8:34:51 AM
 const OFFLINE_URL = 'https://nebula.gearside.com/offline/';
 const OFFLINE_IMG = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/offline.svg';
 const OFFLINE_GA_DIMENSION = 'cd2';

diff --git a/Nebula-Child/style.css b/Nebula-Child/style.css
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/critical.css b/assets/css/critical.css
diff --git a/assets/css/login.css b/assets/css/login.css
diff --git a/assets/css/pre.css b/assets/css/pre.css
diff --git a/assets/js/nebula.js b/assets/js/nebula.js
@@ -4623,6 +4623,7 @@ nebula.addHTML5VideoPlayer = function(id, element){
 nebula.youtubeTracking = function(){
 	nebula.once(function(){
 		if ( jQuery('iframe[src*="youtube"], .lazy-youtube').length ){
+			//Load the Youtube iframe API script
 			var tag = document.createElement('script');
 			tag.src = "https://www.youtube.com/iframe_api";
 			var firstScriptTag = document.getElementsByTagName('script')[0];
@@ -4635,6 +4636,11 @@ function onYouTubeIframeAPIReady(e){
 	window.performance.mark('(Nebula) Loading Youtube Videos [Start]');
 	jQuery('iframe[src*="youtube"]').each(function(i){
 		if ( !jQuery(this).hasClass('ignore') ){ //Use this class to ignore certain videos from tracking
+			//If this iframe is using a data-src, make sure the src matches
+			if ( jQuery(this).attr('src').indexOf('youtube') < 0 ){ //If the src does not contain "youtube"
+				jQuery(this).attr('src', jQuery(this).attr('data-src')); //Update the src to match the data-src attribute. Note: I cannot think of a better way to do this that actually works with the Youtube Iframe API
+			}
+
 			var id = jQuery(this).attr('id');
 			if ( !id ){
 				id = jQuery(this).attr('src').split('?')[0].split('/').pop();
@@ -5064,7 +5070,7 @@ nebula.createVimeoPlayers = function(){
 	});
 
 	if ( typeof videoProgress === 'undefined' ){
-		videoProgress = {};
+		var videoProgress = {};
 	}
 };
 

diff --git a/assets/scss/style.scss b/assets/scss/style.scss
@@ -4,7 +4,7 @@
 	Description: Nebula is a springboard WordPress theme framework for developers. Like other WordPress startup themes, it has custom functionality built-in (like shortcodes, styles, and JS/PHP functions), but unlike other themes Nebula is not meant for the end-user.
 	Author: Pinckney Hugo Group
 	Author URI: http://www.pinckneyhugo.com
-	Version: 8.5.18.5362
+	Version: 8.5.20.3575
 	License: GNU General Public License v2.0 or later
 	License URI: http://www.gnu.org/licenses/gpl-2.0.html
 	Tags: one-column, two-columns, three-columns, four-columns, left-sidebar, right-sidebar, threaded-comments, theme-options, sticky-post, post-formats, microformats, full-width-template, front-page-post-form, flexible-header, featured-images, featured-image-header, editor-style, custom-menu, custom-colors, accessibility-ready

diff --git a/inc/data/nebula_theme.json b/inc/data/nebula_theme.json
@@ -1,5 +1,5 @@
 {
-	"version": "8.5.18.5361",
+	"version": "8.5.20.3575",
 	"details_url": "https://github.com/chrisblakley/Nebula/commits/main",
 	"download_url": "https://github.com/chrisblakley/Nebula/archive/main.zip"
 }