From d3da09b640288b7bbb9033d0cd15cb44e87b0754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= Date: Sat, 23 Feb 2019 04:52:36 +0100 Subject: [PATCH] [FIX] Resize Reservation Issue --- .../static/src/lib/hcalendar/js/hcalendar.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js b/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js index 42ae0f351..e38a31e3e 100644 --- a/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js +++ b/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js @@ -598,6 +598,8 @@ HotelCalendar.prototype = { //==== ROOMS _filterRooms: function() { + // Two-Step filter: Scrollbar mistake + // 1. Filter rooms for (var r of this.options.rooms) { r._active = this._in_domain(r, this._domains[HotelCalendar.DOMAIN.ROOMS]); if (r._active) { @@ -605,14 +607,21 @@ HotelCalendar.prototype = { } else { r._html.classList.add('hcal-hidden'); } - if (r.id in this._reservationsMap) { - for (var reserv of this._reservationsMap[r.id]) { - this._updateReservation(reserv, !r._active); - } - } } this._calcViewHeight(); + + // 2. Update Reservations + _.defer(function(self){ + for (var r of self.options.rooms) { + var isHidden = r._html.classList.contains('hcal-hidden'); + if (r.id in self._reservationsMap) { + for (var reserv of self._reservationsMap[r.id]) { + self._updateReservation(reserv, isHidden); + } + } + } + }, this); //_.defer(function(){ this._updateReservationOccupation() }.bind(this)); },