changes to the integration files. popcorn-port
authorhamidouk
Tue, 18 Oct 2011 15:39:47 +0200
branchpopcorn-port
changeset 88 4de2f474ca01
parent 87 c037221d9c76
child 89 e22e6a28a8ff
changes to the integration files.
test/integration/index-youtube.htm
test/integration/index.htm
--- a/test/integration/index-youtube.htm	Tue Oct 18 15:38:30 2011 +0200
+++ b/test/integration/index-youtube.htm	Tue Oct 18 15:39:47 2011 +0200
@@ -41,11 +41,13 @@
 					};
 		
 		IriSP.loadLibs(IriSP.lib, config.gui.css, function() {});     
-		var pop = Popcorn.youtube("#LdtPlayer", "http://www.youtube.com/watch?v=QH2-TGUlwu4");    
+		var pop = Popcorn.youtube("#LdtPlayer", "http://www.youtube.com/watch?v=lFtNG1wZ4zU", {controls: 0});    
 		var dt = new IriSP.DataLoader();
 		var ser = new IriSP.JSONSerializer(dt, "../test.json");
 		var player = new IriSP.PlayerWidget(pop, config, ser);
-		ser.sync(IriSP.wrap(player, player.draw));
+		var annotationWidget = new IriSP.AnnotationsWidget(pop, config, ser);		
+		ser.sync(function() { player.draw();  annotationWidget.draw(); });
+		
 	});
 	</script>
 	
--- a/test/integration/index.htm	Tue Oct 18 15:38:30 2011 +0200
+++ b/test/integration/index.htm	Tue Oct 18 15:39:47 2011 +0200
@@ -41,11 +41,12 @@
 					};
 		
 		IriSP.loadLibs(IriSP.lib, config.gui.css, function() {});     
-		Popcorn = Popcorn("#video");    
+		pop = Popcorn("#video");    
 		dt = new IriSP.DataLoader();
 		ser = new IriSP.JSONSerializer(dt, "../test.json");
-		var player = new IriSP.PlayerWidget(Popcorn, config, ser);
-		ser.sync(IriSP.wrap(player, player.draw));
+		var player = new IriSP.PlayerWidget(pop, config, ser);
+		var annotationWidget = new IriSP.AnnotationsWidget(pop, config, ser);
+		ser.sync(function() { player.draw();  annotationWidget.draw(); });
 		});
 	</script>