diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 4d767ab00..0bdd948c5 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -743,8 +743,13 @@ var AIRTIME = (function(AIRTIME){ viewport = AIRTIME.utilities.findViewportDimensions(); widgetHeight = viewport.height - 185; width = Math.floor(viewport.width - 110); + + var libTableHeight = widgetHeight - 130; $lib.height(widgetHeight) + .find(".dataTables_scrolling") + .css("max-height", libTableHeight) + .end() .width(Math.floor(width * 0.55)); $pl.height(widgetHeight) diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index 9cb61cecf..6e6081d7b 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -45,19 +45,29 @@ AIRTIME = (function(AIRTIME) { widgetHeight = viewport.height - 180; screenWidth = Math.floor(viewport.width - 120); + var libTableHeight = widgetHeight - 130, + builderTableHeight = widgetHeight - 95; + //set the heights of the main widgets. - $lib.height(widgetHeight); - $builder.height(widgetHeight); + $builder.height(widgetHeight) + .find(".dataTables_scrolling") + .css("max-height", builderTableHeight) + .end() + .width(screenWidth); if ($lib.filter(':visible').length > 0) { - $lib.width(Math.floor(screenWidth * 0.5)); - + $lib.width(Math.floor(screenWidth * 0.5)) + .height(widgetHeight) + .find(".dataTables_scrolling") + .css("max-height", libTableHeight) + .end(); + $builder.width(Math.floor(screenWidth * 0.5)) .find("#sb_edit") .remove() .end(); - } + } } mod.onReady = function() {