Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

[1218] Fix broken calendar JS #1232

Merged
merged 1 commit into from
Apr 24, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/javascripts/calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ function renderCalendar(reservations, week_start, max, blackouts) {
week_end.setDate(week_start.getDate() + 6);

for(var d = 0; d < reservations.length; d++) {
var end = new Date (reservations[d].end);
var start = new Date (reservations[d].start);
var end = dateInTimeZone(reservations[d].end);
var start = dateInTimeZone(reservations[d].start);
if ((start < week_end) && (end >= week_start)) {
//for each reservation, decrement availability per day
var begin_date = ((week_start > start) ? week_start : start);
Expand Down