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:
denise 2012-08-09 17:24:00 -04:00
commit f75cf5ffe2
12 changed files with 159 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/public/js/airtime/library/library.js
View file

@ -423,7 +423,9 @@ var AIRTIME = (function(AIRTIME) {
playlistIndex = $(this).parent().attr('id').substring(3); //remove the pl_
open_playlist_preview(playlistIndex, 0);
} else if (aData.ftype === 'audioclip') {
open_audio_preview(aData.audioFile, aData.track_title, aData.artist_name);
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
} else if (aData.ftype == 'stream') {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
}
return false;
});
@ -637,7 +639,7 @@ var AIRTIME = (function(AIRTIME) {
playlistIndex = $(this).parent().attr('id').substring(3); //remove the pl_
open_playlist_preview(playlistIndex, 0);
} else if (data.ftype === 'audioclip') {
open_audio_preview(data.audioFile, data.track_title, data.artist_name);
open_audio_preview(data.ftype, data.audioFile, data.track_title, data.artist_name);
} else if (data.ftype === 'block') {
blockIndex = $(this).parent().attr('id').substring(3); //remove the pl_
open_block_preview(blockIndex, 0);

2
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -296,7 +296,7 @@ var AIRTIME = (function(AIRTIME){
$('#spl_name > a')
.empty()
.append(json.name);
$('#spl_length')
$('#obj_length')
.empty()
.append(json.length);
$('#fieldset-metadate_change textarea')