Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Naomi Aro 2012-05-02 11:15:20 +02:00
commit c5f9288aab
20 changed files with 80 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/dashboard/playlist.js
View file

@ -91,7 +91,7 @@ function updateProgressBarValue(){
songPercentDone = 0;
currentSong = null;
} else {
if (currentSong.media_item_played == true && currentShow.length > 0){
if (currentShow.length > 0){
scheduled_play_line_to_switch.attr("class", "line-to-switch on");
scheduled_play_div.addClass("ready")
scheduled_play_source = true;

2
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -414,7 +414,7 @@ var AIRTIME = (function(AIRTIME){
$image = $(nRow).find('td.sb-image');
//check if the file exists.
if (aData.image === true) {
$image.html('<img src="/css/images/icon_audioclip.png"></img>')
$image.html('<img title="Track preview" src="/css/images/icon_audioclip.png"></img>')
.click(function() {
open_show_preview(aData.instance, aData.pos);
return false;