Refactor #367

primefaces · Apr 2, 2018 · e65924c · e65924c
1 parent e7b7eae
commit e65924c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js
@@ -529,12 +529,11 @@ export class Calendar extends Component {
 
     isDateBetween(start, end, dateMeta) {
         if(start && end) {
-            return ((start.getDate() < dateMeta.day && start.getMonth() === dateMeta.month && start.getFullYear() === dateMeta.year) || (start.getMonth() < dateMeta.month && start.getFullYear() <= dateMeta.year)) && 
-                   ((end.getDate() > dateMeta.day && end.getMonth() === dateMeta.month && end.getFullYear() === dateMeta.year) || (end.getMonth() > dateMeta.month && end.getFullYear() >= dateMeta.year));
-        }
-        else {
-            return false; 
+            let date = new Date(dateMeta.year, dateMeta.month, dateMeta.day);
+            return start.getTime() <= date.getTime() && end.getTime() >= date.getTime();
         }
+
+        return false;
     }
 
     isToday(today, day, month, year) {