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

CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show 

-done
This commit is contained in:
denise 2012-06-26 15:36:45 -04:00
parent 8005049bdc
commit 05fa673e42
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -8,7 +8,9 @@ var AIRTIME = (function(AIRTIME){
$sbTable, $sbTable,
$toolbar, $toolbar,
$ul, $ul,
$lib; $lib,
cursors = [],
cursorIds = [];
if (AIRTIME.showbuilder === undefined) { if (AIRTIME.showbuilder === undefined) {
AIRTIME.showbuilder = {}; AIRTIME.showbuilder = {};
@ -127,7 +129,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.selectCursor = function($el) { mod.selectCursor = function($el) {
$el.addClass(CURSOR_SELECTED_CLASS); $el.addClass(CURSOR_SELECTED_CLASS);
mod.checkToolBarIcons(); mod.checkToolBarIcons();
}; };
@ -208,11 +210,16 @@ var AIRTIME = (function(AIRTIME){
mod.fnItemCallback = function(json) { mod.fnItemCallback = function(json) {
checkError(json); checkError(json);
cursors = $(".cursor-selected-row");
for (i = 0; i < cursors.length; i++) {
cursorIds.push(($(cursors.get(i)).attr("id")));
}
oSchedTable.fnDraw(); oSchedTable.fnDraw();
mod.enableUI(); mod.enableUI();
}; };
mod.fnAdd = function(aMediaIds, aSchedIds) { mod.fnAdd = function(aMediaIds, aSchedIds) {
mod.disableUI(); mod.disableUI();
@ -401,7 +408,6 @@ var AIRTIME = (function(AIRTIME){
headerIcon; headerIcon;
fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) { fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
$node = $(nRow.children[iNodeIndex]); $node = $(nRow.children[iNodeIndex]);
$node.html(sRowContent); $node.html(sRowContent);
$node.attr('colspan',100); $node.attr('colspan',100);
@ -413,7 +419,9 @@ var AIRTIME = (function(AIRTIME){
$nRow.addClass(sClass); $nRow.addClass(sClass);
}; };
$nRow.attr("id", aData.id);
if (aData.header === true) { if (aData.header === true) {
//remove the column classes from all tds. //remove the column classes from all tds.
$nRow.find('td').removeClass(); $nRow.find('td').removeClass();
@ -615,6 +623,7 @@ var AIRTIME = (function(AIRTIME){
$cursorRows, $cursorRows,
$table = $(this), $table = $(this),
$parent = $table.parent(), $parent = $table.parent(),
$tr,
//use this array to cache DOM heights then we can detach the table to manipulate it to increase speed. //use this array to cache DOM heights then we can detach the table to manipulate it to increase speed.
heights = []; heights = [];
@ -653,6 +662,13 @@ var AIRTIME = (function(AIRTIME){
}); });
$td.append(markerDiv).wrapInner(wrapperDiv); $td.append(markerDiv).wrapInner(wrapperDiv);
}
//re-highlight selected cursors before draw took place
for (i = 0; i < cursorIds.length; i++) {
$tr = $table.find("tr[id="+cursorIds[i]+"]");
mod.selectCursor($tr);
} }
//if there is only 1 cursor on the page highlight it by default. //if there is only 1 cursor on the page highlight it by default.