Merge pull request #262 from spennythug/caption-search-pull

Making it so videos with and without captions can be mixed. Also fixe…
unl · Jul 28, 2015 · b13ff24 · b13ff24
2 parents b1ae9a9 + 43b2db8
commit b13ff24
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/www/templates/html/MediaPlayer.tpl.php b/www/templates/html/MediaPlayer.tpl.php
@@ -53,7 +53,7 @@
                     var $video = $(v);
                     var mediahub_id = $video.attr('data-mediahub-id');
 
-                    <?php if($getTracks): ?>
+                    if(t.captionsButton){
                         t.container.append($(".mh_transcript_template").html());
                         $transcript = t.container.find('.mh-transcript');
                         $captionSearch = t.container.children(".mh-caption-search");
@@ -141,7 +141,7 @@
                                     .prepend($('<span>').text('[' + displaytime(track.entries.times[i].start*1000) + '] '))
                                 ));
                             };
-                            $transcript.children("a").remove();
+                            $transcript.children("li").remove();
                             $transcript.append(listItems);
                         };
 
@@ -162,7 +162,7 @@
                                 setTranscript(t.selectedTrack);
                             };
                         };
-                    <?php endif; ?>
+                    };
 
                     // Playcount
                     var w = false, u = '<?php echo $controller->getURL($context->media) ?>';