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

CC-1665: Scheduled stream rebroadcasting and recording

Browse source 
-playlists load contents now correctly identify tracks vs streams
This commit is contained in:
Martin Konecny 2012-07-20 17:38:11 -04:00
parent cf2f96ecf1
commit 8b2facaa96
15 changed files with 283 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View file

@ -30,8 +30,9 @@ var AIRTIME = (function(AIRTIME){
if (aData.ftype === "audioclip") {
$nRow.addClass("lib-audio");
}
else {
} else if (aData.ftype === "stream"){
$nRow.addClass("lib-stream");
} else {
$nRow.addClass("lib-pl");
}
@ -45,7 +46,7 @@ var AIRTIME = (function(AIRTIME){
mod.redrawChosen();
mod.checkToolBarIcons();
$('#library_display tr.lib-audio').draggable({
$('#library_display tr.lib-audio, tr.lib-stream, tr.lib-pl').draggable({
helper: function(){
var $el = $(this),

11
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -27,11 +27,12 @@ var AIRTIME = (function(AIRTIME){
mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var $nRow = $(nRow);
if (aData.ftype === "audioclip") {
$nRow.addClass("lib-audio");
}
else {
} else if (aData.ftype === "stream"){
$nRow.addClass("lib-stream");
} else {
$nRow.addClass("lib-pl");
}
@ -45,7 +46,7 @@ var AIRTIME = (function(AIRTIME){
mod.redrawChosen();
mod.checkToolBarIcons();
$('#library_display tr.lib-audio, tr.lib-pl').draggable({
$('#library_display tr.lib-audio, tr.lib-pl, tr.lib-stream').draggable({
helper: function(){
var $el = $(this),
@ -178,4 +179,4 @@ var AIRTIME = (function(AIRTIME){
return AIRTIME;
}(AIRTIME || {}));
}(AIRTIME || {}));

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

@ -40,7 +40,7 @@ var AIRTIME = (function(AIRTIME) {
cItem,
i, length,
count = 0,
reAudio=/^au/ ;
reAudio=/^(au|st|pl)/ ;
// Get visible items and check if any chosenItems are visible
$trs = $libTable.find("tbody input:checkbox").parents("tr");

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

@ -575,9 +575,8 @@ var AIRTIME = (function(AIRTIME){
aSelected = AIRTIME.library.getSelectedData();
for (i = 0, length = aSelected.length; i < length; i++) {
if (aSelected[i].ftype === "audioclip") {
aItems.push(aSelected[i].id);
}
var type = aSelected[i].ftype;
aItems.push(new Array(aSelected[i].id, type));
}
aReceiveItems = aItems;
@ -648,7 +647,7 @@ var AIRTIME = (function(AIRTIME){
}
mod.fnNew = function() {
var url = '/Webstream/new';
var url = '/Playlist/new';
stopAudioPreview();
@ -765,7 +764,7 @@ var AIRTIME = (function(AIRTIME){
mod.fnAddItems = function(aItems, iAfter, sAddType) {
var sUrl = "/playlist/add-items";
oData = {"ids": aItems, "afterItem": iAfter, "type": sAddType};
oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType};
playlistRequest(sUrl, oData);
};