Merge pull request #33 from garf/master

Allow same date range
ManukMinasyan · Oct 16, 2019 · 3127c2b · 3127c2b · vercel · Oct 16, 2019
2 parents e19bc42 + def0681
commit 3127c2b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/FunctionalCalendar.vue b/src/components/FunctionalCalendar.vue
@@ -492,8 +492,8 @@
                         // Start Date not empty, chose date > start date
                     } else if (this.calendar.dateRange.end.date === false && (clickDate > startDate)) {
                         this.calendar.dateRange.end.date = item.date;
-                        // Start date not empty, chose date < start date
-                    } else if (this.calendar.dateRange.start.date !== false && (clickDate < startDate)) {
+                        // Start date not empty, chose date <= start date (also same date range select)
+                    } else if (this.calendar.dateRange.start.date !== false && (clickDate <= startDate)) {
                         this.calendar.dateRange.end.date = this.calendar.dateRange.start.date;
                         this.calendar.dateRange.start.date = item.date;
                     }
@@ -582,6 +582,11 @@
                                     day.isMarked = true;
                                 }
 
+                                if (startDate && startDate === endDate) {
+                                    day.isMouseToLeft = false
+                                    day.isMouseToRight = false
+                                }
+
                                 if (startDate && endDate) {
                                     if (helpCalendar.getDateFromFormat(day.date).getTime() > helpCalendar.getDateFromFormat(startDate)
                                         && helpCalendar.getDateFromFormat(day.date) < helpCalendar.getDateFromFormat(endDate)) {