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.
updated the test to use the new slider widget. popcorn-port
authorhamidouk
Thu, 10 Nov 2011 15:13:46 +0100
branchpopcorn-port
changeset 227 0eb060a3b656
parent 226 d1f0e604bd06
child 228 53d8d95a0079
updated the test to use the new slider widget.
test/integration/html5-video.htm file | annotate | diff | comparison | revisions
test/integration/jwplayer-video.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	Thu Nov 10 15:06:22 2011 +0100
+++ b/test/integration/html5-video.htm	Thu Nov 10 15:13:46 2011 +0100
@@ -38,7 +38,14 @@
                   format:'cinelab',
                   src:'../test.json',
                   type:'json'}
-              }]},
+              }, 
+              {type: "SliderWidget",
+               metadata:{
+                format:'cinelab',
+                src:'../test.json',
+                type:'json'}
+              },
+              ]},
 						player:{
 							type:'html5',							
               file:'../trailer.ogv',
--- a/test/integration/jwplayer-video.htm	Thu Nov 10 15:06:22 2011 +0100
+++ b/test/integration/jwplayer-video.htm	Thu Nov 10 15:13:46 2011 +0100
@@ -40,7 +40,14 @@
                   format:'cinelab',
                   src:'../test.json',
                   type:'json'}
-              }]},
+              },
+              {type: "SliderWidget",
+               metadata:{
+                format:'cinelab',
+                src:'../test.json',
+                type:'json'}
+              }
+              ],
 						player:{
 							type:'jwplayer',
 							flashplayer:'../../res/swf/player.swf',
--- a/test/integration/polemic-youtube.htm	Thu Nov 10 15:06:22 2011 +0100
+++ b/test/integration/polemic-youtube.htm	Thu Nov 10 15:13:46 2011 +0100
@@ -48,7 +48,7 @@
 							heigh: 160,
 							metadata : {
 								format:'cinelab',
-								src:'polemic.json',
+								src:'polemic_fr.json',
 								type:'empty'
 							}
 						 }],
@@ -59,7 +59,13 @@
 						  format:'cinelab',
 						  src:'polemic_fr.json',
 						  type:'json'}
-						}
+						},
+            {type: "SliderWidget",
+						 metadata:{
+						  format:'cinelab',
+						  src:'polemic_fr.json',
+						  type:'json'}
+						},
 					  	
 					  ]
 			  },
--- a/test/integration/polemic.htm	Thu Nov 10 15:06:22 2011 +0100
+++ b/test/integration/polemic.htm	Thu Nov 10 15:13:46 2011 +0100
@@ -59,7 +59,13 @@
               format:'cinelab',
               src:'polemic_fr.json',
               type:'json'}
-            }
+            },
+            {type: "SliderWidget",
+						 metadata:{
+						  format:'cinelab',
+						  src:'polemic_fr.json',
+						  type:'json'}
+						},
               
             ]
         },
--- a/test/integration/radio.htm	Thu Nov 10 15:06:22 2011 +0100
+++ b/test/integration/radio.htm	Thu Nov 10 15:13:46 2011 +0100
@@ -40,6 +40,12 @@
 						  src:'../test.json',
 						  type:'json'}
 						},
+						{type: "SliderWidget",
+						 metadata:{
+						  format:'cinelab',
+						  src:'../test.json',
+						  type:'json'}
+						},
 						{type: "AnnotationsWidget", 
 						 metadata:{
 						  format:'cinelab',
--- a/test/integration/youtube.htm	Thu Nov 10 15:06:22 2011 +0100
+++ b/test/integration/youtube.htm	Thu Nov 10 15:13:46 2011 +0100
@@ -37,6 +37,12 @@
 						  src:'../test.json',
 						  type:'json'}
 						},
+            {type: "SliderWidget",
+						 metadata:{
+						  format:'cinelab',
+						  src:'../test.json',
+						  type:'json'}
+						},
 						
 						{type: "SegmentsWidget", // please note that type refers directly to the constructor of the widget.
 						 mode: "radio",
metadataplayer