merge of '5dc4cb1b1db106a86e6f11efc1734d6d529c5a5b'

and 'ee8550aaa8fff50b1f80d13d050359038bd92e54'

Monotone-Parent: 5dc4cb1b1db106a86e6f11efc1734d6d529c5a5b
Monotone-Parent: ee8550aaa8fff50b1f80d13d050359038bd92e54
Monotone-Revision: cc50967cd5623fad93774ada2fe5af98c14b2a98

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-26T14:49:48
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-10-26 14:49:48 +00:00
commit 59ed1ace53
2 changed files with 2 additions and 3 deletions

View File

@ -1025,10 +1025,9 @@ function refreshCalendarEventsCallback(http) {
}
onWindowResize(null);
}
if (http.callbackData["scrollEvent"]) {
if (http.callbackData["scrollEvent"])
preventAutoScroll = false;
scrollDayView(http.callbackData["scrollEvent"]);
}
scrollDayView(http.callbackData["scrollEvent"]);
}
else
log("AJAX error when refreshing calendar events");