Mercurial Mercurial > metadataplayer / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed the files to follow the simpler embed convention. popcorn-port
authorhamidouk
Mon, 30 Jan 2012 16:24:15 +0100
branchpopcorn-port
changeset 744 76400fd4ce70
parent 743 69a9969daa41
child 745 a996a24e07d6
changed the files to follow the simpler embed convention.
test/integration/html5-video.htm file | annotate | diff | comparison | revisions
test/integration/jwplayer-video.htm file | annotate | diff | comparison | revisions
test/integration/polemic-festival.htm file | annotate | diff | comparison | revisions
test/integration/polemic-jsonp.htm file | annotate | diff | comparison | revisions
test/integration/polemic-platform.htm file | annotate | diff | comparison | revisions
test/integration/polemic-youtube.htm file | annotate | diff | comparison | revisions
test/integration/polemic.htm file | annotate | diff | comparison | revisions
test/integration/radio.htm file | annotate | diff | comparison | revisions
test/integration/youtube.htm file | annotate | diff | comparison | revisions 
--- a/test/integration/html5-video.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/html5-video.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -52,13 +52,7 @@
               duration: 50}
 					};
 		
-      IriSP.loadLibs(IriSP.lib, config.gui.css, '../test.json', function() { 	
-          var layoutManager = new IriSP.LayoutManager(config.gui.container);
-          var pop = IriSP.configurePopcorn(layoutManager, config.player);
-          
-          var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
-
-    });
+      IriSP.initPlayer(config, "polemic_fr.json");
 	</script>
   
  </body>
--- a/test/integration/jwplayer-video.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/jwplayer-video.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -52,11 +52,7 @@
               duration: 50}
 					};
 		
-          IriSP.loadLibs(IriSP.lib, config, "../test.json", function() { 	
-              var layoutManager = new IriSP.LayoutManager(config.gui.container);
-              var pop = IriSP.configurePopcorn(layoutManager, config.player);
-              
-              var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+          IriSP.initPlayer(config, "../test.json");
 	</script>
 	
 	
--- a/test/integration/polemic-festival.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/polemic-festival.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -141,14 +141,8 @@
 
     };
     
-    IriSP.loadLibs(IriSP.lib, config, json_url,
-      function() {   
-              var layoutManager = new IriSP.LayoutManager(config.gui.container);
-              var pop = IriSP.configurePopcorn(layoutManager, config.player);
-              
-              var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); 
-              var modules = IriSP.configureModules(pop, config.modules); 
-      });
+    IriSP.initPlayer(config, json_url);
+
   </script>
   
   
--- a/test/integration/polemic-jsonp.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/polemic-jsonp.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -114,14 +114,7 @@
 
     };
     
-    IriSP.loadLibs(IriSP.lib, config, "polemic_fr.json",
-      function() {   
-              var layoutManager = new IriSP.LayoutManager(config.gui.container);
-              var pop = IriSP.configurePopcorn(layoutManager, config.player);
-              
-              var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); 
-              var modules = IriSP.configureModules(pop, config.modules); 
-      });
+    IriSP.initPlayer(config, "polemic_fr.json");
   </script>
   
   
--- a/test/integration/polemic-platform.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/polemic-platform.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -28,7 +28,9 @@
     var project_id = "1771a6cf-3dfd-11e1-a3d8-001d7d7c6d1d";
     var json_src = platf_url + "cljson/id/" + project_id;
     
+    IriSP.widgetsDefaults["createAnnotationWidget"] = {};
     IriSP.widgetsDefaults["createAnnotationWidget"].cinecast_version = false;
+    
     var config = {            
         gui:{
             width:650,        
@@ -161,14 +163,7 @@
 
     };
     
-    IriSP.loadLibs(IriSP.lib, config, json_src,
-      function() {   
-              var layoutManager = new IriSP.LayoutManager(config.gui.container);
-              var pop = IriSP.configurePopcorn(layoutManager, config.player);
-              
-              var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); 
-              var modules = IriSP.configureModules(pop, config.modules); 
-      });
+    IriSP.initPlayer(config, json_src);
   </script>
   
   
--- a/test/integration/polemic-youtube.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/polemic-youtube.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -104,12 +104,7 @@
             }
 		};
 		
-		IriSP.loadLibs(IriSP.lib, config, "polemic_fr.json",
-			function() { 	
-							var layoutManager = new IriSP.LayoutManager(config.gui.container);
-							var pop = IriSP.configurePopcorn(layoutManager, config.player);
-							
-							var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+    IriSP.initPlayer(config, "polemic_fr.json");
 	</script>
 	
 	
--- a/test/integration/polemic.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/polemic.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -147,14 +147,7 @@
 
     };
     
-    IriSP.loadLibs(IriSP.lib, config, "polemic_fr.json",
-      function() {   
-              var layoutManager = new IriSP.LayoutManager(config.gui.container);
-              var pop = IriSP.configurePopcorn(layoutManager, config.player);
-              
-              var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); 
-              var modules = IriSP.configureModules(pop, config.modules); 
-      });
+    IriSP.initPlayer(config, "polemic_fr.json");
   </script>
   
   
--- a/test/integration/radio.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/radio.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -67,12 +67,7 @@
             }
 		};
 		
-		IriSP.loadLibs(IriSP.lib, config, "../test.json",
-			function() { 	
-							var layoutManager = new IriSP.LayoutManager(config.gui.container);
-							var pop = IriSP.configurePopcorn(layoutManager, config.player);
-							
-							var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+    IriSP.initPlayer(config, "../test.json");
 	</script>
 	
 	
--- a/test/integration/youtube.htm	Mon Jan 30 16:23:55 2012 +0100
+++ b/test/integration/youtube.htm	Mon Jan 30 16:24:15 2012 +0100
@@ -85,12 +85,8 @@
 				}
 		};
 		
-		IriSP.loadLibs(IriSP.lib, config, '../test.json',
-			function() { 	
-							var layoutManager = new IriSP.LayoutManager(config.gui.container);
-							var pop = IriSP.configurePopcorn(layoutManager, config.player);
-							
-							var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); });
+    IriSP.initPlayer(config, "../test.json");
+
 	</script>
 <div id='Ldt-Root'>
 	<div id='Ldt-PlaceHolder'>
metadataplayer