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

Fix small showbuilder bugs

This commit is contained in:
Duncan Sommerville 2015-08-06 10:40:50 -04:00
parent 4cbc49391b
commit 83902ebbbe
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
View File

@ -197,7 +197,7 @@ var AIRTIME = (function(AIRTIME) {
function addToCurrentOrNext(arr) { function addToCurrentOrNext(arr) {
var el; var el;
// Add to the end of the current show by getting the footer // Add to the end of the current show by getting the footer
el = $(".sb-footer.sb-current-show"); el = $(".sb-footer.sb-future:first");
var data = el.prev().data("aData"); var data = el.prev().data("aData");
if (data === undefined) { if (data === undefined) {

16
airtime_mvc/public/js/airtime/showbuilder/_builder.js
View File

@ -13,6 +13,7 @@ var AIRTIME = (function(AIRTIME){
showInstanceIds = [], showInstanceIds = [],
headerFooter = [], headerFooter = [],
DISABLED_CLASS = 'ui-state-disabled', DISABLED_CLASS = 'ui-state-disabled',
selected,
$previouslySelected; $previouslySelected;
if (AIRTIME.showbuilder === undefined) { if (AIRTIME.showbuilder === undefined) {
@ -280,9 +281,10 @@ var AIRTIME = (function(AIRTIME){
checkError(json); checkError(json);
mod.getSelectedCursors(); mod.getSelectedCursors();
selected = $(".sb-selected");
oSchedTable.fnDraw(); oSchedTable.fnDraw();
mod.enableUI(); mod.enableUI();
//Unneccessary reload of the library pane after moving tracks in the showbuilder pane. //Unneccessary reload of the library pane after moving tracks in the showbuilder pane.
//$("#library_content").find("#library_display").dataTable().fnStandingRedraw(); //$("#library_content").find("#library_display").dataTable().fnStandingRedraw();
@ -343,7 +345,7 @@ var AIRTIME = (function(AIRTIME){
{"items": aItems, "format": "json"}, {"items": aItems, "format": "json"},
mod.fnItemCallback mod.fnItemCallback
); );
}else{ } else {
mod.enableUI(); mod.enableUI();
} }
}; };
@ -468,7 +470,7 @@ var AIRTIME = (function(AIRTIME){
//sure everything works properly. //sure everything works properly.
for (i = 0, length = a.length; i < length; i++) { for (i = 0, length = a.length; i < length; i++) {
if (typeof(a[i]) === "string") { if (typeof(a[i]) === "string") {
a[i] = (a[i] === "true") ? true : false; a[i] = (a[i] === "true");
} }
} }
@ -733,6 +735,14 @@ var AIRTIME = (function(AIRTIME){
mod.checkToolBarIcons(); mod.checkToolBarIcons();
var sid;
if (selected !== undefined) {
selected.each(function (i, el) {
sid = $(el).attr("id");
$("#" + sid).addClass(SB_SELECTED_CLASS);
});
}
}, },
// R = ColReorder, C = ColVis // R = ColReorder, C = ColVis