Merge remote-tracking branch 'ScottDowne/t609' into develop

jbuck · Jun 24, 2011 · ce9fb20 · ce9fb20
2 parents 13e585d + 40f73dc
commit ce9fb20
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 19 deletions.
diff --git a/parsers/parserSBV/popcorn.parserSBV.unit.html b/parsers/parserSBV/popcorn.parserSBV.unit.html
@@ -26,7 +26,6 @@ <h2 id="qunit-userAgent"></h2>
   <video id='video' 
     controls
     width= '250px'
-    data-timeline-sources="data/data.sbv"
     poster="../../test/poster.png"> 
 
     <source id='mp4'

diff --git a/parsers/parserSBV/popcorn.parserSBV.unit.js b/parsers/parserSBV/popcorn.parserSBV.unit.js
@@ -29,7 +29,7 @@ test( "Popcorn 0.3 SBV Parser Plugin", function () {
     }
   }
 
-  poppercorn.parseSBV( document.getElementById( "video" ).getAttribute( "data-timeline-sources" ) );
+  poppercorn.parseSBV( "data/data.sbv" );
 
   expect(expects);
 

diff --git a/parsers/parserSRT/popcorn.parserSRT.unit.html b/parsers/parserSRT/popcorn.parserSRT.unit.html
@@ -26,7 +26,6 @@ <h2 id="qunit-userAgent"></h2>
   <video id='video'
     controls
     width="250px"
-    data-timeline-sources="./data/unit.srt"
     poster="../../test/poster.png">
 
     <source id='mp4'
@@ -41,4 +40,4 @@ <h2 id="qunit-userAgent"></h2>
 
   </video>
 </body>
-</html>
+</html>
diff --git a/parsers/parserSRT/popcorn.parserSRT.unit.js b/parsers/parserSRT/popcorn.parserSRT.unit.js
@@ -74,7 +74,7 @@ test("Popcorn 0.3 SRT Parser Plugin", function () {
     }
   }
 
-  poppercorn.parseSRT( document.getElementById( 'video' ).getAttribute( 'data-timeline-sources' ) );
+  poppercorn.parseSRT( "data/unit.srt" );
 
   expects = expectedSubs.length*4+1;
   expect( expects );
@@ -105,4 +105,4 @@ test("Popcorn 0.3 SRT Parser Plugin", function () {
 
   }, 500);
 
-});
+});
diff --git a/parsers/parserSSA/popcorn.parserSSA.unit.html b/parsers/parserSSA/popcorn.parserSSA.unit.html
@@ -26,7 +26,6 @@ <h2 id="qunit-userAgent"></h2>
   <video id='video' 
     controls
     width= '250px'
-    data-timeline-sources="data/data.ssa"
     poster="../../test/poster.png"> 
 
     <source id='mp4'

diff --git a/parsers/parserSSA/popcorn.parserSSA.unit.js b/parsers/parserSSA/popcorn.parserSSA.unit.js
@@ -29,7 +29,7 @@ test( "Popcorn 0.3 SSA/ASS Parser Plugin", function () {
     }
   }
 
-  poppercorn.parseSSA( document.getElementById( "video" ).getAttribute( "data-timeline-sources" ) );
+  poppercorn.parseSSA( "data/data.ssa" );
 
   expect( expects );
   stop( 5000 );

diff --git a/parsers/parserTTML/popcorn.parserTTML.unit.html b/parsers/parserTTML/popcorn.parserTTML.unit.html
@@ -26,7 +26,6 @@ <h2 id="qunit-userAgent"></h2>
   <video id='video' 
     controls
     width= '250px'
-    data-timeline-sources="data/unit.ttml"
     poster="../../test/poster.png"> 
 
     <source id='mp4'

diff --git a/parsers/parserTTML/popcorn.parserTTML.unit.js b/parsers/parserTTML/popcorn.parserTTML.unit.js
@@ -73,7 +73,7 @@ test( "Popcorn 0.3 TTML Parser Plugin", function () {
     }
   }
 
-  poppercorn.parseTTML( document.getElementById( 'video' ).getAttribute( "data-timeline-sources" ) );
+  poppercorn.parseTTML( "data/unit.ttml" );
 
   expect( expects );
   stop( 5000 );

diff --git a/parsers/parserTTXT/popcorn.parserTTXT.unit.html b/parsers/parserTTXT/popcorn.parserTTXT.unit.html
@@ -26,7 +26,6 @@ <h2 id="qunit-userAgent"></h2>
   <video id='video' 
     controls
     width= '250px'
-    data-timeline-sources="data/unit.TTXT"
     poster="../../test/poster.png"> 
 
     <source id='mp4'

diff --git a/parsers/parserTTXT/popcorn.parserTTXT.unit.js b/parsers/parserTTXT/popcorn.parserTTXT.unit.js
@@ -29,7 +29,7 @@ test("Popcorn 0.3 TTXT Parser Plugin", function () {
     }
   }
 
-  poppercorn.parseTTXT(document.getElementById('video').getAttribute('data-timeline-sources'));
+  poppercorn.parseTTXT( "data/unit.TTXT" );
 
   expects = subs.length*3+1;
   expect(expects);

diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.html b/parsers/parserVTT/popcorn.parserVTT.unit.html
@@ -26,7 +26,6 @@ <h2 id="qunit-userAgent"></h2>
   <video id='video'
     controls
     width= '250px'
-    data-timeline-sources="data/unit.vtt"
     poster="../../test/poster.png">
 
     <source id='mp4'
@@ -41,4 +40,4 @@ <h2 id="qunit-userAgent"></h2>
 
   </video>
 </body>
-</html>
+</html>
diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.js b/parsers/parserVTT/popcorn.parserVTT.unit.js
@@ -38,7 +38,7 @@ test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
     }
   }
 
-  poppercorn.parseVTT( document.getElementById( 'video' ).getAttribute( 'data-timeline-sources' ) );
+  poppercorn.parseVTT( "data/unit.vtt" );
   expect( expects );
   stop( 5000 );
 
@@ -64,4 +64,4 @@ test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
 
   }, 500);
 
-});
+});
diff --git a/plugins/subtitle/popcorn.subtitle.js b/plugins/subtitle/popcorn.subtitle.js
@@ -217,7 +217,18 @@
             options.accessibility = accessibility;
 
             options.toggleSubtitles = function() {
-              options.selectedLanguage = options.languageSrc.options[ options.languageSrc.selectedIndex ].value;              
+
+              options.selectedLanguage = options.languageSrc.options[ options.languageSrc.selectedIndex ].value;
+
+              if ( options.accessibility.checked || options.selectedLanguage !== ( options.language || "") ) {
+
+                options.display = "inline";
+                options.container.style.display = options.display;
+              } else if ( options.selectedLanguage === ( options.language || "") ) {
+
+                options.display = "none";
+                options.container.style.display = options.display;
+              }
             };
 
             options.accessibility.addEventListener( "change", options.toggleSubtitles, false );

diff --git a/plugins/subtitle/popcorn.subtitle.unit.js b/plugins/subtitle/popcorn.subtitle.unit.js
@@ -1,7 +1,7 @@
 test("Popcorn Subtitle Plugin", function () {
 
   var popped = Popcorn( "#video" ),
-      expects = 11,
+      expects = 14,
       count = 0,
       subTop = 9001,
       subLeft = 9001,
@@ -73,6 +73,7 @@ test("Popcorn Subtitle Plugin", function () {
   popped.exec( 1.5, function() {
 
     popped.media.pause();
+
     // check position of subttile that should of moved with video,
     // a subtitle must be displayed to get valid data
     ok( subtitlediv.style.left !== subLeft, "subtitle's left position has changed" );
@@ -91,6 +92,7 @@ test("Popcorn Subtitle Plugin", function () {
 
     equals (subtitlediv.children[ 1 ].innerHTML, "this is the second subtitle of 2011", "subtitle displaying correct information" );
     plus();
+
     popped.media.play();
 
   });
@@ -100,13 +102,30 @@ test("Popcorn Subtitle Plugin", function () {
     popped.media.pause();
     equals (subtitlediv.children[ 1 ].innerHTML, "", "subtitle is clear" );
     plus();
+
     popped.media.play();
 
   });
 
   popped.exec( 3.5, function() {
- 
+
     popped.media.play();
+
+    equals (subtitlediv.style.display, "inline", "subtitles being displayed with accessiblity on" );
+    plus();
+
+    // turn accessibility off
+    document.getElementById( "accessibility" ).click();
+
+    equals (subtitlediv.style.display, "none", "subtitles not being displayed with accessiblity off" );
+    plus();
+
+    // turn accessibility back on
+    document.getElementById( "accessibility" ).click();
+
+    equals (subtitlediv.style.display, "inline", "subtitles being displayed with accessiblity back on" );
+    plus();
+
     equals (subtitlediv.children[ 2 ].innerHTML, "this is the third subtitle of 2011", "subtitle displaying correct information" );
     plus();
     popped.media.play();