# HG changeset patch # User hamidouk # Date 1327937055 -3600 # Node ID 76400fd4ce70fc0dca8b766c4f9a6d357580a90d # Parent 69a9969daa41861aac6182214465e350b2133bab changed the files to follow the simpler embed convention. diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/html5-video.htm --- 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"); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/jwplayer-video.htm --- 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"); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/polemic-festival.htm --- 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); + diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/polemic-jsonp.htm --- 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"); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/polemic-platform.htm --- 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); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/polemic-youtube.htm --- 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"); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/polemic.htm --- 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"); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/radio.htm --- 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"); diff -r 69a9969daa41 -r 76400fd4ce70 test/integration/youtube.htm --- 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"); +