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.
Merge with popcorn-port tweet-widget
authorhamidouk
Fri, 18 Nov 2011 16:32:32 +0100
branchtweet-widget
changeset 280 3da58bd31096
parent 278 ff20c80c6845 (current diff)
parent 279 2c65775623cb (diff)
child 281 7edd686a2b2a
Merge with popcorn-port
test/integration/polemic-youtube.htm file | annotate | diff | comparison | revisions
test/integration/polemic.htm file | annotate | diff | comparison | revisions 
--- a/test/integration/polemic-youtube.htm	Fri Nov 18 16:25:22 2011 +0100
+++ b/test/integration/polemic-youtube.htm	Fri Nov 18 16:32:32 2011 +0100
@@ -53,6 +53,12 @@
 							}
 						 }],
 						},
+            {type: "SliderWidget",
+						 metadata:{
+						  format:'cinelab',
+						  src:'polemic_fr.json',
+						  type:'json'}
+						}
 						{type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
 						 mode: "radio",
 						 metadata:{
@@ -71,14 +77,7 @@
 						  format:'cinelab',
 						  src:'polemic_fr.json',
 						  type:'json'}
-						},
-            {type: "SliderWidget",
-						 metadata:{
-						  format:'cinelab',
-						  src:'polemic_fr.json',
-						  type:'json'}
 						}
-					  	
 					  ]
 			  },
 			player:{
--- a/test/integration/polemic.htm	Fri Nov 18 16:25:22 2011 +0100
+++ b/test/integration/polemic.htm	Fri Nov 18 16:32:32 2011 +0100
@@ -53,6 +53,12 @@
               }
              }],
             },
+            {type: "SliderWidget",
+						 metadata:{
+						  format:'cinelab',
+						  src:'polemic_fr.json',
+						  type:'json'}
+						},
             {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
              mode: "radio",
              metadata:{
@@ -71,14 +77,7 @@
 						  format:'cinelab',
 						  src:'polemic_fr.json',
 						  type:'json'}
-						},
-            {type: "SliderWidget",
-						 metadata:{
-						  format:'cinelab',
-						  src:'polemic_fr.json',
-						  type:'json'}
-						},
-              
+						}      
             ]
         },
       player:{
metadataplayer