From 9064f81bc6f87fd1f15da2c6102f5f50f3e6a62a Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Tue, 4 Sep 2012 02:33:42 -0700 Subject: [PATCH] minor sidebar fix --- lms/static/js/discussions-temp.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lms/static/js/discussions-temp.js b/lms/static/js/discussions-temp.js index 67fb7ac72d..12a3f0e0b8 100644 --- a/lms/static/js/discussions-temp.js +++ b/lms/static/js/discussions-temp.js @@ -348,15 +348,16 @@ function updateSidebarDimensions(e) { discussionColumnHeight = $('.discussion-column').outerHeight(); discussionColumnBottom = $('.discussion-column').offset().top + discussionColumnHeight; windowHeight = $(window).height(); - $('.sidebar').height(discussionColumnHeight); - $('.post-list-wrapper').height(discussionColumnHeight - SIDEBAR_HEADER_HEIGHT - 4); + sidebarHeight = Math.min(windowHeight, discussionColumnHeight); + $('.sidebar').height(sidebarHeight); + $('.post-list-wrapper').height(sidebarHeight - SIDEBAR_HEADER_HEIGHT - 4); $('.sidebar').css('width', .32 * $('.discussion-body').width() + 'px'); //$('.sidebar').height(discussionColumnBottom - scrollTop); //$('.post-list-wrapper').height(discussionColumnBottom - scrollTop - SIDEBAR_HEADER_HEIGHT - 4); - //if((discussionColumnBottom - scrollTop) < windowHeight){ - // $('.sidebar').height(discussionColumnHeight); - // $('.post-list-wrapper').height(discussionColumnHeight - SIDEBAR_HEADER_HEIGHT - 4); - //} + if((discussionColumnBottom - scrollTop) < windowHeight){ + $('.sidebar').height(discussionColumnHeight); + $('.post-list-wrapper').height(discussionColumnHeight - SIDEBAR_HEADER_HEIGHT - 4); + } }