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

CC-3174 : showbuilder

Browse source 
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
This commit is contained in:
Naomi Aro 2012-02-04 21:26:21 +01:00
parent 38f3d6bfb0
commit e8f2506474
18 changed files with 416 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -282,16 +282,7 @@ var AIRTIME = (function(AIRTIME){
.empty()
.append(json.html);
mod.setUpPlaylist();
}
function setPlaylistButtonEvents(el) {
$(el).delegate("#spl_new",
{"click": AIRTIME.playlist.fnNew});
$(el).delegate("#spl_delete",
{"click": AIRTIME.playlist.fnDelete});
setUpPlaylist();
}
//sets events dynamically for playlist entries (each row in the playlist)
@ -336,7 +327,7 @@ var AIRTIME = (function(AIRTIME){
"keydown": submitOnEnter});
}
mod.setUpPlaylist = function() {
function setUpPlaylist(playlist) {
var playlist = $("#side_playlist"),
sortableConf;
@ -478,11 +469,6 @@ var AIRTIME = (function(AIRTIME){
playlist.find("#spl_crossfade").removeClass("ui-state-active");
playlist.find("#crossfade_main").hide();
});
setPlaylistButtonEvents(playlist);
setPlaylistEntryEvents(playlist);
setCueEvents(playlist);
setFadeEvents(playlist);
sortableConf = (function(){
var origRow,
@ -530,8 +516,7 @@ var AIRTIME = (function(AIRTIME){
start: function(event, ui) {
ui.placeholder.html("PLACE HOLDER")
.width("99.5%")
.height(56)
.append('<div style="clear:both;"/>');
.height(56);
},
receive: fnReceive,
update: fnUpdate
@ -600,12 +585,27 @@ var AIRTIME = (function(AIRTIME){
});
};
mod.init = function() {
var playlist = $("#side_playlist");
$(playlist).delegate("#spl_new",
{"click": AIRTIME.playlist.fnNew});
$(playlist).delegate("#spl_delete",
{"click": AIRTIME.playlist.fnDelete});
setPlaylistEntryEvents(playlist);
setCueEvents(playlist);
setFadeEvents(playlist);
setUpPlaylist(playlist);
}
return AIRTIME;
}(AIRTIME || {}));
$(document).ready(function() {
AIRTIME.playlist.setUpPlaylist();
AIRTIME.playlist.init();
});