diff options
| -rwxr-xr-x | modules-available/locationinfo/frontend/doorsign.html | 7 | ||||
| -rwxr-xr-x | modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/modules-available/locationinfo/frontend/doorsign.html b/modules-available/locationinfo/frontend/doorsign.html index cd800283..70d29823 100755 --- a/modules-available/locationinfo/frontend/doorsign.html +++ b/modules-available/locationinfo/frontend/doorsign.html @@ -933,15 +933,13 @@ optional: clientHeight = clientHeight - document.getElementById('header_' + room.id).clientHeight
- document.getElementsByClassName("wc-time-column-header")[0].clientHeight -2;
- if (roomsToshow > 1) {
- clientHeight -= 5;
- }
+
if (room.config.mode == 1 && room.config.vertical) {
clientHeight = clientHeight * (room.config.scale / 100);
clientHeight -= 22;
}
-
+ clientHeight -=5;
var height = clientHeight / (room.openTimes * cal.weekCalendar("option", "timeslotsPerHour"));
@@ -956,6 +954,7 @@ optional: cal.weekCalendar("updateFreeBusy", room.openingTimesCalendar);
}
cal.weekCalendar("resizeCalendar");
+ cal.weekCalendar("scrollToHour");
}
// used for countdown
diff --git a/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js b/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js index 808939f3..f6404ea3 100755 --- a/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js +++ b/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js @@ -323,9 +323,13 @@ function MyDate() { this._loadCalEvents(this.element.data('startDate')); }, - resizeCalendar:function(){ + resizeCalendar:function(){ this._resizeCalendar(); - }, + }, + scrollToHour:function(){ + console.log("scroll"); + this._scrollToHour(new MyDate(), false); + }, /* * Clear all events currently loaded into the calendar */ |