Kaynağa Gözat

pass in legacyEvent to eventDrop. fix dateDelta

Adam Shaw 8 yıl önce
ebeveyn
işleme
d44803bbb6
2 değiştirilmiş dosya ile 4 ekleme ve 3 silme
  1. 2 2
      src/common/Grid.events.js
  2. 2 1
      src/common/View.js

+ 2 - 2
src/common/Grid.events.js

@@ -372,7 +372,7 @@ Grid.mixin({
 				footprint = hit.component.getSafeHitFootprint(hit);
 				footprint = hit.component.getSafeHitFootprint(hit);
 
 
 				if (origFootprint && footprint) {
 				if (origFootprint && footprint) {
-					eventDefMutation = _this.computeEventDropMutation(origFootprint, footprint);
+					eventDefMutation = _this.computeEventDropMutation(origFootprint, footprint, event);
 
 
 					if (eventDefMutation) {
 					if (eventDefMutation) {
 						mutatedEventInstanceGroup = eventManager.buildMutatedEventInstanceGroup(
 						mutatedEventInstanceGroup = eventManager.buildMutatedEventInstanceGroup(
@@ -500,7 +500,7 @@ Grid.mixin({
 
 
 
 
 	// DOES NOT consider overlap/constraint
 	// DOES NOT consider overlap/constraint
-	computeEventDropMutation: function(startFootprint, endFootprint) {
+	computeEventDropMutation: function(startFootprint, endFootprint, legacyEvent) {
 		var date0 = startFootprint.unzonedRange.getStart();
 		var date0 = startFootprint.unzonedRange.getStart();
 		var date1 = endFootprint.unzonedRange.getStart();
 		var date1 = endFootprint.unzonedRange.getStart();
 		var clearEnd = false;
 		var clearEnd = false;

+ 2 - 1
src/common/View.js

@@ -728,10 +728,11 @@ var View = FC.View = ChronoComponent.extend({
 			eventMutation,
 			eventMutation,
 			this.calendar
 			this.calendar
 		);
 		);
+		var dateMutation = eventMutation.dateMutation;
 
 
 		this.triggerEventDrop(
 		this.triggerEventDrop(
 			eventManager.getEventInstancesWithId(eventDef.id)[0].toLegacy(),
 			eventManager.getEventInstancesWithId(eventDef.id)[0].toLegacy(),
-			eventMutation.dateMutation.dateDelta,
+			(dateMutation && dateMutation.dateDelta) || moment.duration(),
 			undoFunc,
 			undoFunc,
 			el, ev
 			el, ev
 		);
 		);