Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-5778 : Improving Builder Rendering Time 

making it work in firefox.
This commit is contained in:
Naomi 2014-04-07 12:59:55 -04:00
parent 2f7cff2629
commit 58dd09f136
3 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
airtime_mvc/public/css/showbuilder.css
View File

@ -115,14 +115,16 @@ div.sb-timerange input.error {
} }
.innerWrapper { .innerWrapper {
position:relative; position: relative;
width:100%; width: 100%;
height: 100%;
} }
.marker { .marker {
background: url(images/tl-arrow.png) no-repeat scroll 3px 4px; background: url(images/tl-arrow.png) no-repeat scroll 3px 4px;
display: block; display: block;
height: 9px; height: 9px;
left: -13px; left: -18px;
bottom: -14px;
padding: 4px 0 4px 3px; padding: 4px 0 4px 3px;
position: absolute; position: absolute;
width: 9px; width: 9px;
@ -255,10 +257,6 @@ table.datatable tr.sb-header.odd:hover td, table.datatable tr.sb-header.even:hov
margin-right:5px; margin-right:5px;
} }
.sb-checkbox, .sb-empty td {
position: relative;
}
/* /*
* keep the dialog css at the bottom so it can override previous rules if needed. * keep the dialog css at the bottom so it can override previous rules if needed.
*/ */

2
airtime_mvc/public/css/styles.css
View File

@ -701,7 +701,7 @@ dl.inline-list dd {
.datatable tr td, .datatable tr th { .datatable tr td, .datatable tr th {
border-color: #b1b1b1; border-color: #b1b1b1;
border-style: solid; border-style: solid;
border-width: 1px 0 0 1px; border-width: 0 0 1px 1px;
font-size: 13px; font-size: 13px;
padding: 5px 5px; padding: 5px 5px;
} }

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

@ -481,7 +481,16 @@ var AIRTIME = (function(AIRTIME){
$nRow = $(nRow), $nRow = $(nRow),
$image, $image,
$div, $div,
headerIcon; headerIcon,
$wrapper;
//http://stackoverflow.com/a/6119684
$wrapper = $("<div/>", {
"class": "innerWrapper"
});
$node = $(nRow.children[0]);
$node.html($wrapper);
fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) { fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
$node = $(nRow.children[iNodeIndex]); $node = $(nRow.children[iNodeIndex]);
@ -499,9 +508,6 @@ var AIRTIME = (function(AIRTIME){
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();
$node = $(nRow.children[0]);
$node.html("");
cl = 'sb-header'; cl = 'sb-header';
if (aData.record === true) { if (aData.record === true) {
@ -511,13 +517,13 @@ var AIRTIME = (function(AIRTIME){
$div = $("<div/>", { $div = $("<div/>", {
"class": "small-icon " + headerIcon "class": "small-icon " + headerIcon
}); });
$node.append($div); $wrapper.append($div);
} }
else if (aData.rebroadcast === true) { else if (aData.rebroadcast === true) {
$div = $("<div/>", { $div = $("<div/>", {
"class": "small-icon rebroadcast" "class": "small-icon rebroadcast"
}); });
$node.append($div); $wrapper.append($div);
} }
sSeparatorHTML = '<span class="show-title">'+aData.title+'</span>'; sSeparatorHTML = '<span class="show-title">'+aData.title+'</span>';
@ -544,17 +550,15 @@ var AIRTIME = (function(AIRTIME){
else if (aData.footer === true) { else if (aData.footer === true) {
//remove the column classes from all tds. //remove the column classes from all tds.
$nRow.find('td').removeClass(); $nRow.find('td').removeClass();
$node = $(nRow.children[0]);
cl = 'sb-footer'; cl = 'sb-footer';
//check the show's content status. //check the show's content status.
if (aData.runtime >= 0) { if (aData.runtime >= 0) {
$node.html('<span class="ui-icon ui-icon-check"></span>'); $wrapper.html('<span class="ui-icon ui-icon-check"></span>');
cl = cl + ' ui-state-highlight'; cl = cl + ' ui-state-highlight';
} }
else { else {
$node.html('<span class="ui-icon ui-icon-notice"></span>'); $wrapper.html('<span class="ui-icon ui-icon-notice"></span>');
cl = cl + ' ui-state-error'; cl = cl + ' ui-state-error';
} }
@ -564,13 +568,10 @@ var AIRTIME = (function(AIRTIME){
else if (aData.empty === true) { else if (aData.empty === true) {
//remove the column classes from all tds. //remove the column classes from all tds.
$nRow.find('td').removeClass(); $nRow.find('td').removeClass();
$node = $(nRow.children[0]);
$node.html('');
//putting the cursor on the screen //putting the cursor on the screen
if (aData.allowed && $lib.length > 0 && $lib.filter(":visible").length > 0) { if (aData.allowed && $lib.length > 0 && $lib.filter(":visible").length > 0) {
$node.append('<div class="marker"></div>'); $wrapper.append('<div class="marker"></div>');
} }
sSeparatorHTML = '<span>'+$.i18n._("Show Empty")+'</span>'; sSeparatorHTML = '<span>'+$.i18n._("Show Empty")+'</span>';
@ -582,9 +583,6 @@ var AIRTIME = (function(AIRTIME){
//remove the column classes from all tds. //remove the column classes from all tds.
$nRow.find('td').removeClass(); $nRow.find('td').removeClass();
$node = $(nRow.children[0]);
$node.html('');
sSeparatorHTML = '<span>'+$.i18n._("Recording From Line In")+'</span>'; sSeparatorHTML = '<span>'+$.i18n._("Recording From Line In")+'</span>';
cl = cl + " sb-record odd"; cl = cl + " sb-record odd";
@ -622,18 +620,14 @@ var AIRTIME = (function(AIRTIME){
}); });
} }
$node = $(nRow.children[0]);
if (aData.allowed === true && aData.scheduled >= 1) { if (aData.allowed === true && aData.scheduled >= 1) {
$node.html('<input type="checkbox" name="'+aData.id+'"></input>'); $wrapper.html('<input type="checkbox" name="'+aData.id+'"></input>');
//putting the cursor on the screen //putting the cursor on the screen
if ($lib.length > 0 && $lib.filter(":visible").length > 0) { if ($lib.length > 0 && $lib.filter(":visible").length > 0) {
$node.append('<div class="marker"></div>'); $wrapper.append('<div class="marker"></div>');
} }
} }
else {
$node.html('');
}
} }
//add the show colour to the leftmost td //add the show colour to the leftmost td
@ -675,8 +669,6 @@ var AIRTIME = (function(AIRTIME){
} }
else { else {
$nRow.addClass("sb-allowed"); $nRow.addClass("sb-allowed");
$nRow.attr("id", aData.id);
$nRow.attr("si_id", aData.instance);
} }
//status used to colour tracks. //status used to colour tracks.
@ -718,8 +710,7 @@ var AIRTIME = (function(AIRTIME){
} }
isInitialized = true; isInitialized = true;
var $td, var aData,
aData,
elements, elements,
i, length, temp, i, length, temp,
$cursorRows, $cursorRows,
@ -730,7 +721,8 @@ var AIRTIME = (function(AIRTIME){
//only create the cursor arrows if the library is on the page. //only create the cursor arrows if the library is on the page.
if ($lib.length > 0 && $lib.filter(":visible").length > 0) { if ($lib.length > 0 && $lib.filter(":visible").length > 0) {
$cursorRows = $sbTable.find("tbody tr.sb-future.sb-allowed:not(.sb-header, .sb-empty)"); //$cursorRows = $sbTable.find("tbody tr.sb-future.sb-allowed:not(.sb-header, .sb-empty)");
$cursorRows = $sbTable.find("div.marker").parents("tr");
//re-highlight selected cursors before draw took place //re-highlight selected cursors before draw took place
/* /*
@ -761,10 +753,7 @@ var AIRTIME = (function(AIRTIME){
//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.
if ($cursorRows.length === 1) { if ($cursorRows.length === 1) {
$td = $cursorRows.find("td:first"); $cursorRows.addClass("cursor-selected-row");
if (!$td.hasClass("dataTables_empty")) {
$cursorRows.addClass("cursor-selected-row");
}
} }
} }