Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2013-04-03 15:54:07 -04:00
parent 6863f7c775 4351fda3d1
commit 5be284abac
1 changed files with 4 additions and 0 deletions
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -160,6 +160,8 @@
        html += '</audio';

        var nowPlayingBar = $('#nowPlayingBar').show();
+	    //show stop button
+	    $('#stopButton', nowPlayingBar).show();

        $('#mediaElement', nowPlayingBar).html(html);

@@ -192,6 +194,8 @@
        var html = '<video id="videoWindow" class="itemVideo video-js vjs-default-skin"></video>';

        var nowPlayingBar = $('#nowPlayingBar');
+	    //hide stop button
+	    $('#stopButton', nowPlayingBar).hide();

        $('#mediaElement', nowPlayingBar).addClass("video").html(html).show();