diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index f87dafcd7..75a100b8a 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -8,7 +8,7 @@ var AIRTIME = (function(AIRTIME) { mod = AIRTIME.library; mod.checkAddButton = function() { - var selected = mod.getChosenItemsLength(), $cursor = $('tr.cursor-selected-row'), check = false; + var selected = mod.getChosenItemsLength(), $cursor = $('tr.sb-selected'), check = false; // make sure library items are selected and a cursor is selected. if (selected !== 0 && $cursor.length !== 0) { @@ -146,7 +146,7 @@ var AIRTIME = (function(AIRTIME) { }); } - $("#show_builder_table tr.cursor-selected-row") + $("#show_builder_table tr.sb-selected") .each(function(i, el) { aData.push($(el).prev().data("aData")); }); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index aa179f8e2..cc1178752 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -320,7 +320,7 @@ var AIRTIME = (function(AIRTIME){ mod.fnMove = function(aSelect, aAfter) { - //mod.disableUI(); + mod.disableUI(); $.post(baseUrl+"showbuilder/schedule-move", {"format": "json", "selectedItem": aSelect, "afterItem": aAfter}, @@ -592,7 +592,9 @@ var AIRTIME = (function(AIRTIME){ //$node = $(nRow.children[0]).replaceWith(emptyNode);; //$node.html(''); - $node.empty(); + if ($node) { + $node.empty(); + } sSeparatorHTML = ''+$.i18n._("Show Empty")+''; cl = cl + " sb-empty odd"; @@ -827,7 +829,7 @@ var AIRTIME = (function(AIRTIME){ $parent.append($table); } - + */ //order of importance of elements for setting the next timeout. elements = [ $sbTable.find("tr."+NOW_PLAYING_CLASS), @@ -850,7 +852,8 @@ var AIRTIME = (function(AIRTIME){ mod.timeout = setTimeout(function() {mod.refresh(aData.id)}, refreshInterval); //need refresh in milliseconds break; } - }*/ + } + mod.checkToolBarIcons(); },