From 339c8ed03f2b412a4c8d08036cbec8497cde7593 Mon Sep 17 00:00:00 2001
From: Zach Wise <zach@digitalartwork.net>
Date: Wed, 13 Jun 2012 15:49:06 -0500
Subject: [PATCH] Fix to allow multiple instances of same youtube video in
 different events. closes #153

---
 source/js/Media/VMM.ExternalAPI.js  | 32 +++++++++++++++++------------
 source/js/Media/VMM.MediaElement.js |  6 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/source/js/Media/VMM.ExternalAPI.js b/source/js/Media/VMM.ExternalAPI.js
index d4ad1da..2693490 100644
--- a/source/js/Media/VMM.ExternalAPI.js
+++ b/source/js/Media/VMM.ExternalAPI.js
@@ -967,13 +967,13 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
 		
 		youtube: {
 			
-			get: function(id) {
-				var url = "http://gdata.youtube.com/feeds/api/videos/" + id + "?v=2&alt=jsonc&callback=?";
+			get: function(mid, id) {
+				var the_url = "http://gdata.youtube.com/feeds/api/videos/" + mid + "?v=2&alt=jsonc&callback=?",
+					vid = {mid: mid, id: id};
+					
+				VMM.master_config.youtube.que.push(vid);
 				
-				if (VMM.master_config.youtube.active) {
-					VMM.master_config.youtube.que.push(id);
-				} else {
-					VMM.master_config.youtube.que.push(id);
+				if (!VMM.master_config.youtube.active) {
 					if (!VMM.master_config.youtube.api_loaded) {
 						VMM.LoadLib.js('http://www.youtube.com/player_api', function() {
 							trace("YouTube API Library Loaded");
@@ -982,19 +982,22 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
 				}
 				
 				// THUMBNAIL
-				VMM.getJSON(url, VMM.ExternalAPI.youtube.createThumb);
+				VMM.getJSON(the_url, function(d) {
+					VMM.ExternalAPI.youtube.createThumb(d, vid)
+				});
+				
 			},
 			
-			create: function(id) {
+			create: function(vid) {
 				
 				var p = {
 					active: 				false,
 					player: 				{},
-					name:					'youtube_'+id,
+					name:					'youtube_'+vid.id,
 					playing:				false
 				};
 				
-				p.player['youtube_'+id] = new YT.Player('youtube_'+id, {
+				p.player['youtube_'+vid.id] = new YT.Player('youtube_'+vid.id, {
 					height: 				'390',
 					width: 					'640',
 					playerVars: {
@@ -1004,7 +1007,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
 						theme:				'light',
 						rel:				0
 					},
-					videoId: id,
+					videoId: vid.mid,
 					events: {
 						'onReady': 			VMM.ExternalAPI.youtube.onPlayerReady,
 						'onStateChange': 	VMM.ExternalAPI.youtube.onStateChange
@@ -1014,9 +1017,12 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
 				VMM.master_config.youtube.array.push(p);
 			},
 			
-			createThumb: function(d) {
+			createThumb: function(d, vid) {
+				trace("CREATE THUMB");
+				trace(d);
+				trace(vid);
 				if (typeof d.data != 'undefined') {
-					var thumb_id = "youtube_" + d.data.id + "_thumb";
+					var thumb_id = "youtube_" + vid.id + "_thumb";
 					VMM.attachElement("#" + thumb_id, "<img src='" + d.data.thumbnail.sqDefault + "'>");
 					
 				}
diff --git a/source/js/Media/VMM.MediaElement.js b/source/js/Media/VMM.MediaElement.js
index 837e992..f0ac0b0 100644
--- a/source/js/Media/VMM.MediaElement.js
+++ b/source/js/Media/VMM.MediaElement.js
@@ -33,7 +33,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
 					mediaElem		=	"<div class='thumbnail thumb-instagram' id='instagram_" + m.id + "_thumb'><img src='" + VMM.ExternalAPI.instagram.get(m.id, true) + "'></div>";
 					return mediaElem;
 				} else if (m.type	==	"youtube") {
-					mediaElem		=	"<div class='thumbnail thumb-youtube' id='youtube_" + m.id + "_thumb'></div>";
+					mediaElem		=	"<div class='thumbnail thumb-youtube' id='youtube_" + uid + "_thumb'></div>";
 					return mediaElem;
 				} else if (m.type	==	"googledoc") {
 					mediaElem		=	"<div class='thumbnail thumb-document'></div>";
@@ -120,8 +120,8 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
 					VMM.ExternalAPI.googledocs.get(m.id, uid);
 			// YOUTUBE
 				} else if (m.type		==	"youtube") {
-					mediaElem			=	"<div class='media-shadow'><div class='media-frame video youtube' id='youtube_" + m.id + "'>" + loading_messege + "</div></div>";
-					VMM.ExternalAPI.youtube.get(m.id);
+					mediaElem			=	"<div class='media-shadow'><div class='media-frame video youtube' id='youtube_" + uid + "'>" + loading_messege + "</div></div>";
+					VMM.ExternalAPI.youtube.get(m.id, uid);
 			// VIMEO
 				} else if (m.type		==	"vimeo") {
 					mediaElem			=	"<div class='media-shadow'><iframe class='media-frame video vimeo' autostart='false' frameborder='0' width='100%' height='100%' src='http://player.vimeo.com/video/" + m.id + "?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'></iframe></div>";