From 24da57ae4f639ba883dd722736c0ee714f69dcec Mon Sep 17 00:00:00 2001 From: naomiaro Date: Mon, 31 Jan 2011 10:00:26 -0500 Subject: [PATCH] CC-1811 schedule view/add show screens make calendar height less than one screen size to prevent outer browser scrollbar. --- public/css/add-show.css | 6 +++++- public/js/airtime/schedule/add-show.js | 4 ++++ public/js/airtime/schedule/schedule.js | 7 ++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/public/css/add-show.css b/public/css/add-show.css index b2d86be7d..06ab25aa8 100644 --- a/public/css/add-show.css +++ b/public/css/add-show.css @@ -1,3 +1,7 @@ +body { + overflow: hidden; +} + #schedule-add-show, #fullcalendar_show_display { float: left; @@ -106,4 +110,4 @@ label.wrapp-label input[type="checkbox"] { padding:8px; color:#902d2d; display:none; -} \ No newline at end of file +} diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js index 526f5af7e..e350eae4f 100644 --- a/public/js/airtime/schedule/add-show.js +++ b/public/js/airtime/schedule/add-show.js @@ -128,4 +128,8 @@ $(document).ready(function() { eventRender: eventRender }); + var mainHeight = document.documentElement.clientHeight - 200 - 50; + + $('#fullcalendar_show_display').fullCalendar('option', 'contentHeight', mainHeight); + }); diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js index 6625a669b..9b53eb65a 100644 --- a/public/js/airtime/schedule/schedule.js +++ b/public/js/airtime/schedule/schedule.js @@ -256,12 +256,9 @@ $(document).ready(function() { }); - $(window).load(function(){ - - var mainHeight = this.innerHeight - 200 - 50; + var mainHeight = document.documentElement.clientHeight - 200 - 50; - $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight); - }); + $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight); });