From 78a667036f3de5e37dccc636d0c4932e5c14dddf Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 16 Sep 2011 16:26:10 +0200 Subject: [PATCH] Skeep weekends when paging in in free/busy times display (#382) --- plugins/calendar/calendar_ui.js | 6 ++++++ plugins/calendar/skins/default/templates/calendar.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js index e84b3bdc..06380573 100644 --- a/plugins/calendar/calendar_ui.js +++ b/plugins/calendar/calendar_ui.js @@ -859,6 +859,12 @@ function rcube_calendar_ui(settings) { if (delta) { freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta); + // skip weekends if in workinhoursonly-mode + if (Math.abs(delta) == 1 && freebusy_ui.workinhoursonly) { + while (is_weekend(freebusy_ui.start)) + freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta); + } + freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays); } diff --git a/plugins/calendar/skins/default/templates/calendar.html b/plugins/calendar/skins/default/templates/calendar.html index dd0f3ae9..a878d392 100644 --- a/plugins/calendar/skins/default/templates/calendar.html +++ b/plugins/calendar/skins/default/templates/calendar.html @@ -221,7 +221,7 @@
- +