milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Luke Pulverenti 2013-04-03 15:54:07 -04:00
commit 5be284abac
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/mediaplayer.js
View file

@ -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();