Merge pull request #1687 from ivanteoh/fix-ga

Fix wrong "currentSrc" call in ga plugins. #1686
mediaelement · Feb 24, 2016 · 5bf36bb · 5bf36bb
2 parents 645e61d + 9d4ceef
commit 5bf36bb
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/src/js/mep-feature-googleanalytics.js b/src/js/mep-feature-googleanalytics.js
@@ -18,51 +18,51 @@ $.extend(mejs.MepDefaults, {
 
 $.extend(MediaElementPlayer.prototype, {
 	buildgoogleanalytics: function(player, controls, layers, media) {
-			
+
 		media.addEventListener('play', function() {
 			if (typeof _gaq != 'undefined') {
-				_gaq.push(['_trackEvent', 
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventPlay, 
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle
+				_gaq.push(['_trackEvent',
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventPlay,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle
 				]);
 			}
 		}, false);
-		
+
 		media.addEventListener('pause', function() {
 			if (typeof _gaq != 'undefined') {
-				_gaq.push(['_trackEvent', 
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventPause, 
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle
+				_gaq.push(['_trackEvent',
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventPause,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle
 				]);
 			}
-		}, false);	
-		
+		}, false);
+
 		media.addEventListener('ended', function() {
 			if (typeof _gaq != 'undefined') {
-				_gaq.push(['_trackEvent', 
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventEnded, 
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle
+				_gaq.push(['_trackEvent',
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventEnded,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle
 				]);
 			}
 		}, false);
-		
+
 		/*
 		media.addEventListener('timeupdate', function() {
 			if (typeof _gaq != 'undefined') {
-				_gaq.push(['_trackEvent', 
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventEnded, 
+				_gaq.push(['_trackEvent',
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventEnded,
 					player.options.googleAnalyticsTime,
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle,
 					player.currentTime
 				]);
 			}
 		}, true);
 		*/
 	}
 });
-	
-})(mejs.$);
+
+})(mejs.$);
diff --git a/src/js/mep-feature-universalgoogleanalytics.js b/src/js/mep-feature-universalgoogleanalytics.js
@@ -17,51 +17,51 @@ $.extend(mejs.MepDefaults, {
 
 $.extend(MediaElementPlayer.prototype, {
 	builduniversalgoogleanalytics: function(player, controls, layers, media) {
-			
+
 		media.addEventListener('play', function() {
 			if (typeof ga != 'undefined') {
 				ga('send', 'event',
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventPlay, 
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventPlay,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle
 				);
 			}
 		}, false);
-		
+
 		media.addEventListener('pause', function() {
 			if (typeof ga != 'undefined') {
 				ga('send', 'event',
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventPause, 
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventPause,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle
 				);
 			}
-		}, false);	
-		
+		}, false);
+
 		media.addEventListener('ended', function() {
 			if (typeof ga != 'undefined') {
 				ga('send', 'event',
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventEnded, 
-					(player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventEnded,
+					(player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle
 				);
 			}
 		}, false);
-		
+
 		/*
 		media.addEventListener('timeupdate', function() {
 			if (typeof ga != 'undefined') {
 				ga('send', 'event',
-					player.options.googleAnalyticsCategory, 
-					player.options.googleAnalyticsEventEnded, 
+					player.options.googleAnalyticsCategory,
+					player.options.googleAnalyticsEventEnded,
 					player.options.googleAnalyticsTime,
-				  (player.options.googleAnalyticsTitle === '') ? player.currentSrc : player.options.googleAnalyticsTitle,
+				  (player.options.googleAnalyticsTitle === '') ? player.media.currentSrc : player.options.googleAnalyticsTitle,
 					player.currentTime
 				);
 			}
 		}, true);
 		*/
 	}
 });
-	
-})(mejs.$);
+
+})(mejs.$);