Skip to content

Commit

Permalink
Merge branch 'demo' into FLUID-4596
Browse files Browse the repository at this point in the history
  • Loading branch information
@anvk
anvk committed Feb 24, 2012
2 parents 5bf6749 + 129d412 commit f306e49
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 128 deletions.
9 changes: 6 additions & 3 deletions tests/html/VideoPlayer-test.html
View file
Expand Up @@ -9,20 +9,23 @@
<script type="text/javascript" src="../../lib/infusion/MyInfusion.js"></script>
<script type="text/javascript" src="../../lib/jquery-ui/js/jquery.ui.button.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_captionner.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_captionLoader.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_html5Captionator.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_controllers.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_media.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_transcript.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_intervalEventsConductor.js"></script>
<script type="text/javascript" src="../../js/HTML5-backcompat.js"></script>

<!-- jqUnit test framework js files -->
<script type="text/javascript" src="../lib/qunit/js/qunit.js"></script>
<script type="text/javascript" src="../lib/jqUnit/js/jqUnit.js"></script>
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.simulate.js"></script>
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.simulate.js"></script>

<!-- These are tests that have been written using this page as data and test supports -->
<script type="text/javascript" src="../js/VideoPlayerTests.js"></script>

<!-- Utils -->
<script type="text/javascript" src="../../lib/captionator/js/captionator.js"></script>

</head>
<body id="body">
Expand Down
11 changes: 7 additions & 4 deletions tests/html/VideoPlayerControls-test.html
View file
Expand Up @@ -7,22 +7,25 @@
<link rel="stylesheet" type="text/css" media="screen" href="../lib/qunit/css/qunit.css" />
<link rel="stylesheet" type="text/css" media="screen" href="../../css/VideoPlayer.css" />

<script type="text/javascript" src="../../lib/infusion/MyInfusion-noMin.js"></script>
<script type="text/javascript" src="../../lib/infusion/MyInfusion.js"></script>
<script type="text/javascript" src="../../lib/jquery-ui/js/jquery.ui.button.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_captionner.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_captionLoader.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_html5Captionator.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_controllers.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_media.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_intervalEventsConductor.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_transcript.js"></script>

<!-- jqUnit test framework js files -->
<script type="text/javascript" src="../lib/qunit/js/qunit.js"></script>
<script type="text/javascript" src="../lib/jqUnit/js/jqUnit.js"></script>
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.simulate.js"></script>
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.simulate.js"></script>

<!-- These are tests that have been written using this page as data and test supports -->
<script type="text/javascript" src="../js/VideoPlayerControlsTests.js"></script>

<!-- Utils -->
<script type="text/javascript" src="../../lib/captionator/js/captionator.js"></script>

</head>
<body id="body">
Expand Down
7 changes: 5 additions & 2 deletions tests/html/VideoPlayerHTML5Captionator-test.html
View file
Expand Up @@ -15,15 +15,18 @@
<script type="text/javascript" src="../../js/VideoPlayer_media.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_intervalEventsConductor.js"></script>
<script type="text/javascript" src="../../js/HTML5-backcompat.js"></script>
<script type="text/javascript" src="../../lib/captionator/js/captionator.js"></script>
<script type="text/javascript" src="../../js/VideoPlayer_transcript.js"></script>

<!-- jqUnit test framework js files -->
<script type="text/javascript" src="../lib/qunit/js/qunit.js"></script>
<script type="text/javascript" src="../lib/jqUnit/js/jqUnit.js"></script>
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.simulate.js"></script>
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.simulate.js"></script>

<!-- These are tests that have been written using this page as data and test supports -->
<script type="text/javascript" src="../js/VideoPlayerHTML5CaptionatorTests.js"></script>

<!-- Utils -->
<script type="text/javascript" src="../../lib/captionator/js/captionator.js"></script>

</head>
<body id="body">
Expand Down
110 changes: 0 additions & 110 deletions tests/js/VideoPlayerCaptionLoaderTests.js
View file

This file was deleted.

17 changes: 8 additions & 9 deletions tests/js/VideoPlayerTests.js
View file
Expand Up @@ -23,16 +23,15 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt

var initVideoPlayer = function (testOptions) {
var opts = {
model: {
video: {
sources: [
{
src: "http://royalgiz.fr/videoplayer/video/Richard.Stallman.mp4",
type: "video/mp4"
}
]
}
video: {
sources: [
{
src: "http://royalgiz.fr/videoplayer/video/Richard.Stallman.mp4",
type: "video/mp4"
}
]
},
model: {},
templates: {
videoPlayer: {
// override the default template path
Expand Down

0 comments on commit f306e49

Please sign in to comment.