From 2f7cff262914c6ec9ad744f7c14451d738b3c481 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 3 Apr 2014 18:00:32 -0400 Subject: [PATCH] CC-5778 : Improving Builder Rendering Time fix for empty rows. --- airtime_mvc/public/css/showbuilder.css | 5 ++--- .../js/airtime/library/events/lib_showbuilder.js | 2 +- .../public/js/airtime/showbuilder/builder.js | 13 ++++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 809d21ee5..50d3454c8 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -120,7 +120,6 @@ div.sb-timerange input.error { } .marker { background: url(images/tl-arrow.png) no-repeat scroll 3px 4px; - top: -9px; display: block; height: 9px; left: -13px; @@ -140,7 +139,7 @@ tr.cursor-selected-row .marker { } table.datatable tr.cursor-selected-row td, table.datatable tr.cursor-selected-row th { - border-top: 1px solid rgba(215, 0, 0, 1) !important; + border-bottom: 1px solid rgba(215, 0, 0, 1) !important; } .sb-content .sb-past { @@ -256,7 +255,7 @@ table.datatable tr.sb-header.odd:hover td, table.datatable tr.sb-header.even:hov margin-right:5px; } -.sb-checkbox { +.sb-checkbox, .sb-empty td { position: relative; } diff --git a/airtime_mvc/public/js/airtime/library/events/lib_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/lib_showbuilder.js index 3087863aa..4d699c398 100644 --- a/airtime_mvc/public/js/airtime/library/events/lib_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/lib_showbuilder.js @@ -40,7 +40,7 @@ var AIRTIME = (function(AIRTIME) { // process selected schedule rows to add media after. $("#show_builder_table tr.cursor-selected-row").each(function(i, el) { - var data = $(el).prev().data("aData"); + var data = $(el).data("aData"); aSchedIds.push( { "id" : data.id, diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index d36f4477d..3d3a09f76 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -568,6 +568,11 @@ var AIRTIME = (function(AIRTIME){ $node = $(nRow.children[0]); $node.html(''); + //putting the cursor on the screen + if (aData.allowed && $lib.length > 0 && $lib.filter(":visible").length > 0) { + $node.append('
'); + } + sSeparatorHTML = ''+$.i18n._("Show Empty")+''; cl = cl + " sb-empty odd"; @@ -622,11 +627,9 @@ var AIRTIME = (function(AIRTIME){ $node.html(''); //putting the cursor on the screen - if (aData.scheduled == 2) { - if ($lib.length > 0 && $lib.filter(":visible").length > 0) { - $node.append('
'); - } - } + if ($lib.length > 0 && $lib.filter(":visible").length > 0) { + $node.append('
'); + } } else { $node.html('');