fixed the integration tests.
--- a/test/integration/jwplayer-video.htm Wed Dec 21 15:36:19 2011 +0100
+++ b/test/integration/jwplayer-video.htm Wed Dec 21 15:43:00 2011 +0100
@@ -16,15 +16,11 @@
<!-- START Integration ###################################### -->
<!-- SIMPLE PLAYER EXPERIMENTATION -->
<script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
<div id="video"></div>
<div id="LdtPlayer"></div>
<script type="text/javascript">
- $(document).ready(function() {
var config = {
gui:{
width:650,
@@ -56,13 +52,11 @@
duration: 50}
};
- IriSP.loadLibs(IriSP.lib, config.gui.css, "../test.json", function() {
+ 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); });
-
- });
</script>
--- a/test/integration/polemic-youtube.htm Wed Dec 21 15:36:19 2011 +0100
+++ b/test/integration/polemic-youtube.htm Wed Dec 21 15:43:00 2011 +0100
@@ -16,16 +16,11 @@
<!-- START Integration ###################################### -->
<!-- SIMPLE PLAYER EXPERIMENTATION -->
<script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
- <script type="text/javascript" src="../../unittests/mockSerializer.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
<div id="video"></div>
<div id="LdtPlayer"></div>
<script type="text/javascript">
- $(document).ready(function() {
var config = {
gui:{
width:650,
@@ -109,14 +104,12 @@
}
};
- IriSP.loadLibs(IriSP.lib, config.gui.css, "polemic_fr.json",
+ 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); });
-
- });
</script>
--- a/test/integration/polemic.htm Wed Dec 21 15:36:19 2011 +0100
+++ b/test/integration/polemic.htm Wed Dec 21 15:43:00 2011 +0100
@@ -15,17 +15,12 @@
<!-- START Integration ###################################### -->
<!-- SIMPLE PLAYER EXPERIMENTATION -->
- <script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
- <script type="text/javascript" src="../../unittests/mockSerializer.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
+ <script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
<div id="video"></div>
<div id="LdtPlayer"></div>
<script type="text/javascript">
- $(document).ready(function() {
var config = {
gui:{
width:650,
@@ -120,7 +115,7 @@
};
- IriSP.loadLibs(IriSP.lib, config.gui.css, "polemic_fr.json",
+ IriSP.loadLibs(IriSP.lib, config, "polemic_fr.json",
function() {
var layoutManager = new IriSP.LayoutManager(config.gui.container);
var pop = IriSP.configurePopcorn(layoutManager, config.player);
@@ -128,8 +123,6 @@
var widgets = IriSP.configureWidgets(pop, layoutManager, config.gui);
var modules = IriSP.configureModules(pop, config.modules);
});
-
- });
</script>
--- a/test/integration/radio.htm Wed Dec 21 15:36:19 2011 +0100
+++ b/test/integration/radio.htm Wed Dec 21 15:43:00 2011 +0100
@@ -16,16 +16,11 @@
<!-- START Integration ###################################### -->
<!-- SIMPLE PLAYER EXPERIMENTATION -->
<script type="text/javascript" src="../../build/LdtPlayer-release.js" type="text/javascript"></script>
- <script type="text/javascript" src="../../unittests/mockSerializer.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery.tools.min.js" type="text/javascript"></script>
- <script src="../../res/js/jquery-ui.min.js" type="text/javascript"></script>
<div id="video"></div>
<div id="LdtPlayer"></div>
<script type="text/javascript">
- $(document).ready(function() {
var config = {
gui:{
width:650,
@@ -72,14 +67,12 @@
}
};
- IriSP.loadLibs(IriSP.lib, config.gui.css, "../test.json",
+ 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); });
-
- });
</script>
--- a/test/integration/youtube.htm Wed Dec 21 15:36:19 2011 +0100
+++ b/test/integration/youtube.htm Wed Dec 21 15:43:00 2011 +0100
@@ -16,13 +16,10 @@
<!-- START Integration ###################################### -->
<!-- SIMPLE PLAYER EXPERIMENTATION -->
<script type="text/javascript" src="../../build/LdtPlayer-release.js"></script>
- <script src="../../res/js/jquery.min.js"></script>
- <script src="../../res/js/jquery.tools.min.js"></script>
- <script src="../../res/js/jquery-ui.min.js"></script>
+
<div id="LdtPlayer"></div>
<script type="text/javascript">
- $(document).ready(function() {
var config = {
gui:{
width:650,
@@ -43,15 +40,31 @@
src:'../test.json',
type:'json'}
},
-
+
{type: "SegmentsWidget", // please note that type refers directly to the constructor of the widget.
mode: "radio",
metadata:{
format:'cinelab',
src:'../test.json',
+ type:'json'},
+ requires: [{
+ type: "TooltipWidget",
+ width: 180,
+ heigh: 160,
+ metadata : {
+ type:'empty'
+ }
+ }]
+ },
+
+ {type: "ArrowWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
type:'json'}
},
-
+
{type: "AnnotationsWidget", // please note that type refers directly to the constructor of the widget.
mode: "radio",
metadata:{
@@ -72,14 +85,12 @@
}
};
- IriSP.loadLibs(IriSP.lib, config.gui.css, '../test.json',
+ 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); });
-
- });
</script>
<div id='Ldt-Root'>
<div id='Ldt-PlaceHolder'>