From db1287d6ec107fa89122809378d00e8ff6c7aacd Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 3 Apr 2012 15:19:38 +0200 Subject: [PATCH] CC-3508 : Double Scrollbar in Show Builder menu --- airtime_mvc/public/js/airtime/library/library.js | 12 +++++++++++- airtime_mvc/public/js/airtime/showbuilder/builder.js | 7 ++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index b9317ad89..7245378aa 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -32,6 +32,10 @@ var AIRTIME = (function(AIRTIME) { mod.selectNone = function () { $libTable.find("input:checkbox").attr("checked", false); $libTable.find("tr").removeClass(LIB_SELECTED_CLASS); + + //disable all lib buttons. + AIRTIME.button.disableButton("lib-button-delete"); + AIRTIME.button.disableButton("lib-button-add"); }; mod.fnDeleteItems = function(aMedia) { @@ -104,7 +108,7 @@ var AIRTIME = (function(AIRTIME) { "bProcessing": true, "bServerSide": true, - "aLengthMenu": [[10, 15, 20, 25, 50, 100], [10, 15, 20, 25, 50, 100]], + "aLengthMenu": [[5, 10, 15, 20, 25, 50, 100], [5, 10, 15, 20, 25, 50, 100]], "bStateSave": true, "fnStateSaveParams": function (oSettings, oData) { @@ -244,6 +248,12 @@ var AIRTIME = (function(AIRTIME) { hide: 'mouseout' }); }, + //remove any selected nodes before the draw. + "fnPreDrawCallback": function( oSettings ) { + + AIRTIME.button.disableButton("lib-button-delete"); + AIRTIME.button.disableButton("lib-button-add"); + }, "fnDrawCallback": AIRTIME.library.events.fnDrawCallback, "fnHeaderCallback": function(nHead) { $(nHead).find("input[type=checkbox]").attr("checked", false); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 506ee5c26..82dda4f54 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -75,7 +75,7 @@ var AIRTIME = (function(AIRTIME){ function(json){ checkError(json); oSchedTable.fnDraw(); - AIRTIME.library.selectNone(); + AIRTIME.library.selectNone(); }); }; @@ -391,7 +391,6 @@ var AIRTIME = (function(AIRTIME){ }, //remove any selected nodes before the draw. "fnPreDrawCallback": function( oSettings ) { - mod.selectNone(); //disable jump to current button. AIRTIME.button.disableButton("sb-button-delete"); @@ -488,6 +487,8 @@ var AIRTIME = (function(AIRTIME){ //enable cancelling current show. AIRTIME.button.enableButton("sb-button-cancel"); } + + AIRTIME.library.events.enableAddButtonCheck(); }, "fnHeaderCallback": function(nHead) { $(nHead).find("input[type=checkbox]").attr("checked", false); @@ -790,7 +791,7 @@ var AIRTIME = (function(AIRTIME){ aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); }); - AIRTIME.showbuilder.fnRemove(aItems); + mod.fnRemove(aItems); }); //delete selected tracks