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

CC-84: Smart Playlists

Browse source 
- added 'Smart Block' filter in datatable
- added block files to library datatable
This commit is contained in:
denise 2012-07-25 17:08:22 -04:00
parent 1f3cbd8aba
commit bef9ba1eea
9 changed files with 147 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -542,6 +542,7 @@ var AIRTIME = (function(AIRTIME) {
.append('<option value="0">All</option>')
.append('<option value="1">Files</option>')
.append('<option value="2">Playlists</option>')
.append('<option value="3">Smart Blocks</option>')
.end()
.change(function(ev){
oTable.fnDraw();
@ -613,7 +614,11 @@ var AIRTIME = (function(AIRTIME) {
}
else {
callback = function() {
AIRTIME.playlist.fnEdit(data.id);
if (data.ftype === "playlist") {
AIRTIME.playlist.fnEdit(data.id, 'playlist');
} else {
AIRTIME.playlist.fnEdit(data.id, 'block');
}
};
}
oItems.edit.callback = callback;

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

@ -641,13 +641,13 @@ var AIRTIME = (function(AIRTIME){
});
};
mod.fnEdit = function(id) {
var url = '/Playlist/edit';;
mod.fnEdit = function(id, type) {
var url = '/Playlist/edit';
stopAudioPreview();
$.post(url,
{format: "json", id: id},
{format: "json", id: id, type: type},
function(json){
openPlaylist(json);
});

12
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View file

@ -5,18 +5,6 @@ $(document).ready(function() {
function setSmartPlaylistEvents() {
var form = $('#smart-playlist-form');
/*
sets.each(function(index, set){
$(set).live('click', function(){
if ($(this).next().hasClass('closed')) {
$(this).next().removeClass('closed sp-closed');
} else {
$(this).next().addClass('closed sp-closed');
}
});
});
*/
form.find('.criteria_add').live('click', function(){
var div = $('dd[id="sp_criteria-element"]').children('div:visible:last').next();