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

CC-3174 : showbuilder

Browse source 
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
This commit is contained in:
Naomi Aro 2012-02-07 14:58:16 +01:00
parent f651024a6e
commit 251f3a3e5b
6 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ var AIRTIME = (function(AIRTIME){
var mod;
if (AIRTIME.library === undefined) {
AIRTIME.library = {}
AIRTIME.library = {};
}
AIRTIME.library.events = {};
@ -14,7 +14,7 @@ var AIRTIME = (function(AIRTIME){
$nRow.attr("id", aData["tr_id"])
.data("aData", aData)
.data("screen", "playlist");
}
};
mod.fnDrawCallback = function() {
@ -36,7 +36,7 @@ var AIRTIME = (function(AIRTIME){
cursor: 'pointer',
connectToSortable: '#spl_sortable'
});
}
};
/*
* @param oTable the datatables instance for the library.
@ -78,7 +78,7 @@ var AIRTIME = (function(AIRTIME){
["Add", "library_group_add", true, fnAddSelectedItems]];
addToolBarButtonsLibrary(aButtons);
}
};
return AIRTIME;

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

@ -2,7 +2,7 @@ var AIRTIME = (function(AIRTIME){
var mod;
if (AIRTIME.library === undefined) {
AIRTIME.library = {}
AIRTIME.library = {};
}
AIRTIME.library.events = {};
@ -14,7 +14,7 @@ var AIRTIME = (function(AIRTIME){
$nRow.attr("id", aData["tr_id"])
.data("aData", aData)
.data("screen", "timeline");
}
};
mod.fnDrawCallback = function() {
@ -23,7 +23,7 @@ var AIRTIME = (function(AIRTIME){
cursor: 'pointer',
connectToSortable: '#show_builder_table'
});
}
};
mod.setupLibraryToolbar = function(oLibTable) {
var aButtons,
@ -85,7 +85,7 @@ var AIRTIME = (function(AIRTIME){
["Add", "library_group_add", true, fnAddSelectedItems]];
addToolBarButtonsLibrary(aButtons);
}
};
return AIRTIME;

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

@ -248,8 +248,10 @@ var AIRTIME = (function(AIRTIME){
}
function redrawLib() {
var dt;
dt = $("#library_display").dataTable();
var dt = $("#library_display").dataTable(),
oLibTT = TableTools.fnGetInstance('library_display');
oLibTT.fnSelectNone();
dt.fnStandingRedraw();
}
@ -525,7 +527,7 @@ var AIRTIME = (function(AIRTIME){
openPlaylist(json);
redrawLib();
});
}
};
mod.fnEdit = function(id) {
var url;
@ -540,7 +542,7 @@ var AIRTIME = (function(AIRTIME){
openPlaylist(json);
//redrawLib();
});
}
};
mod.fnDelete = function(plid) {
var url, id, lastMod;
@ -556,7 +558,7 @@ var AIRTIME = (function(AIRTIME){
openPlaylist(json);
redrawLib();
});
}
};
mod.fnAddItems = function(aItems, iAfter, sAddType) {
@ -599,7 +601,7 @@ var AIRTIME = (function(AIRTIME){
setFadeEvents(playlist);
setUpPlaylist(playlist);
}
};
return AIRTIME;