Просмотр исходного кода

fix footprint->eventdef fabrication

Adam Shaw 8 лет назад
Родитель
Сommit
46934c7ecd
2 измененных файлов с 19 добавлено и 9 удалено
  1. 10 4
      src/common/Grid.events.js
  2. 9 5
      src/common/Grid.js

+ 10 - 4
src/common/Grid.events.js

@@ -657,7 +657,7 @@ Grid.mixin({
 	computeExternalDrop: function(componentFootprint, meta) {
 		var calendar = this.view.calendar;
 		var isAllDay = componentFootprint.isAllDay;
-		var start = calendar.moment(componentFootprint.dateRange.startMs);
+		var start = FC.moment.utc(componentFootprint.dateRange.startMs).stripZone();
 		var end;
 		var eventDef;
 
@@ -678,10 +678,16 @@ Grid.mixin({
 				end.stripTime();
 			}
 		}
-		else if (!calendar.opt('timezone')) {
-			start.stripZone();
+		else if (calendar.opt('timezone') === 'local') {
+			start.local();
 			if (end) {
-				end.stripZone();
+				end.local();
+			}
+		}
+		else if (calendar.opt('timezone') === 'UTC') {
+			start.utc();
+			if (end) {
+				end.utc();
 			}
 		}
 

+ 9 - 5
src/common/Grid.js

@@ -470,17 +470,21 @@ var Grid = FC.Grid = ChronoComponent.extend({
 		var dummyEvent = new SingleEventDef(new EventSource(calendar));
 		var dummyInstance;
 
-		dummyEvent.start = calendar.moment(componentFootprint.dateRange.startMs);
-		dummyEvent.end = calendar.moment(componentFootprint.dateRange.endMs);
+		dummyEvent.start = FC.moment.utc(componentFootprint.dateRange.startMs).stripZone();
+		dummyEvent.end = FC.moment.utc(componentFootprint.dateRange.endMs).stripZone();
 
 		// TODO: make DRY with computeExternalDrop!
 		if (componentFootprint.isAllDay) {
 			dummyEvent.start.stripTime();
 			dummyEvent.end.stripTime();
 		}
-		else if (!calendar.opt('timezone')) {
-			dummyEvent.start.stripZone();
-			dummyEvent.end.stripZone();
+		else if (calendar.opt('timezone') === 'local') {
+			dummyEvent.start.local();
+			dummyEvent.end.local();
+		}
+		else if (calendar.opt('timezone') === 'UTC') {
+			dummyEvent.start.utc();
+			dummyEvent.end.utc();
 		}
 
 		dummyInstance = dummyEvent.buildInstances()[0];