fix(monthView): dont fire on-date-range-sekect when dragging an event

Closes #614
mattlewis92 · Jun 26, 2017 · 628321c · 628321c
1 parent fedd346
commit 628321c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/directives/mwlCalendarMonth.js b/src/directives/mwlCalendarMonth.js
@@ -133,14 +133,16 @@ angular
     };
 
     vm.onDragSelectEnd = function(day) {
-      vm.dateRangeSelect.endDate = day.date;
-      if (vm.dateRangeSelect.endDate > vm.dateRangeSelect.startDate) {
-        vm.onDateRangeSelect({
-          calendarRangeStartDate: vm.dateRangeSelect.startDate.clone().startOf('day').toDate(),
-          calendarRangeEndDate: vm.dateRangeSelect.endDate.clone().endOf('day').toDate()
-        });
+      if (vm.dateRangeSelect) {
+        vm.dateRangeSelect.endDate = day.date;
+        if (vm.dateRangeSelect.endDate > vm.dateRangeSelect.startDate) {
+          vm.onDateRangeSelect({
+            calendarRangeStartDate: vm.dateRangeSelect.startDate.clone().startOf('day').toDate(),
+            calendarRangeEndDate: vm.dateRangeSelect.endDate.clone().endOf('day').toDate()
+          });
+        }
+        delete vm.dateRangeSelect;
       }
-      delete vm.dateRangeSelect;
     };
 
     vm.$onInit = function() {

diff --git a/src/templates/calendarMonthCellEvents.html b/src/templates/calendarMonthCellEvents.html
@@ -6,6 +6,7 @@
     class="pull-left event"
     ng-class="event.cssClass"
     ng-style="{backgroundColor: event.color.primary}"
+    ng-mousedown="$event.stopPropagation()"
     ng-mouseenter="vm.highlightEvent(event, true)"
     ng-mouseleave="vm.highlightEvent(event, false)"
     tooltip-append-to-body="true"

diff --git a/src/templates/calendarSlideBox.html b/src/templates/calendarSlideBox.html
@@ -5,6 +5,7 @@
       <li
         ng-repeat="event in vm.events | orderBy:'startsAt' track by event.calendarEventId"
         ng-class="event.cssClass"
+        ng-mousedown="$event.stopPropagation()"
         mwl-draggable="event.draggable === true"
         drop-data="{event: event}"
         auto-scroll="vm.draggableAutoScroll">