fix(dayView): dont throw when dragging an event and the date range se…

…lect is enabled Closes #439
mattlewis92 · Sep 3, 2016 · 1e3efdd · 1e3efdd
1 parent 06bc836
commit 1e3efdd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/directives/mwlCalendarHourList.js b/src/directives/mwlCalendarHourList.js
@@ -103,11 +103,13 @@ angular
     };
 
     vm.onDragSelectEnd = function(date) {
-      vm.dateRangeSelect.endDate = date;
-      if (vm.dateRangeSelect.endDate > vm.dateRangeSelect.startDate) {
-        vm.onDateRangeSelect({calendarRangeStartDate: vm.dateRangeSelect.startDate, calendarRangeEndDate: vm.dateRangeSelect.endDate});
+      if (vm.dateRangeSelect) {
+        vm.dateRangeSelect.endDate = date;
+        if (vm.dateRangeSelect.endDate > vm.dateRangeSelect.startDate) {
+          vm.onDateRangeSelect({calendarRangeStartDate: vm.dateRangeSelect.startDate, calendarRangeEndDate: vm.dateRangeSelect.endDate});
+        }
+        delete vm.dateRangeSelect;
       }
-      delete vm.dateRangeSelect;
     };
 
   })

diff --git a/test/unit/directives/mwlCalendarHourList.spec.js b/test/unit/directives/mwlCalendarHourList.spec.js
@@ -177,4 +177,10 @@ describe('mwlCalendarHourList directive', function() {
     expect(element[0].querySelector('.cal-day-hour-part-spacer.foo')).to.be.ok;
   });
 
+  it('should not throw if there is no current range being selected', function() {
+    expect(function() {
+      MwlCalendarCtrl.onDragSelectEnd(new Date());
+    }).not.to.throw();
+  });
+
 });