From 950018b5c393898173ebb5ccb515ff12e836f6af Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 25 Oct 2011 19:56:57 +0200 Subject: [PATCH] Fix scrolling calendar --- apps/calendar/js/calendar.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index afbb1b2858..d63b9df36f 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -204,9 +204,12 @@ Calendar={ direction = 'down'; } } - if(direction == 'down'){ + var scroll = $(document).scrollTop(), + doc_height = $(document).height(), + win_height = $(window).height(); + if(direction == 'down' && win_height == (doc_height - scroll)){ $('#calendar_holder').fullCalendar('next'); - }else{ + }else if (direction == 'top' && scroll == 0) { $('#calendar_holder').fullCalendar('prev'); } }, @@ -483,7 +486,7 @@ function ListView(element, calendar) { } } $(document).ready(function(){ - //Calendar.UI.initScroll(); + Calendar.UI.initScroll(); $('#calendar_holder').fullCalendar({ header: false, firstDay: 1,