Adam Shaw 8 лет назад
Родитель
Сommit
a214f45f09

+ 1 - 1
src/Calendar.events-api.js

@@ -164,7 +164,7 @@ Calendar.mixin({
 
 
 	updateEvent: function(eventProps) {
-		var eventDef = this.eventManager.getEventDefByInternalId(eventProps._id);
+		var eventDef = this.eventManager.getEventDefByUid(eventProps._id);
 		var eventInstance;
 		var eventDefMutation;
 

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

@@ -369,7 +369,7 @@ Grid.mixin({
 						mutatedEventRangeGroup = new EventRangeGroup(
 							eventInstancesToEventRanges(
 								eventManager.buildMutatedEventInstances(
-									eventManager.getEventDefByInternalId(event._id).id,
+									eventManager.getEventDefByUid(event._id).id,
 									eventDefMutation
 								)
 							)
@@ -746,7 +746,7 @@ Grid.mixin({
 						mutatedEventRangeGroup = new EventRangeGroup(
 							eventInstancesToEventRanges(
 								eventManager.buildMutatedEventInstances(
-									eventManager.getEventDefByInternalId(event._id).id,
+									eventManager.getEventDefByUid(event._id).id,
 									resizeMutation
 								)
 							)

+ 2 - 2
src/common/View.js

@@ -712,7 +712,7 @@ var View = FC.View = ChronoComponent.extend({
 	reportEventDrop: function(legacyEvent, eventMutation, el, ev) {
 		var eventManager = this.calendar.eventManager;
 		var undoFunc = eventManager.mutateEventsWithId(
-			eventManager.getEventDefByInternalId(legacyEvent._id).id,
+			eventManager.getEventDefByUid(legacyEvent._id).id,
 			eventMutation,
 			this.calendar
 		);
@@ -769,7 +769,7 @@ var View = FC.View = ChronoComponent.extend({
 	reportEventResize: function(legacyEvent, eventMutation, el, ev) {
 		var eventManager = this.calendar.eventManager;
 		var undoFunc = eventManager.mutateEventsWithId(
-			eventManager.getEventDefByInternalId(legacyEvent._id).id,
+			eventManager.getEventDefByUid(legacyEvent._id).id,
 			eventMutation,
 			this.calendar
 		);

+ 2 - 2
src/models/EventManager.js

@@ -191,9 +191,9 @@ var EventManager = Class.extend(EmitterMixin, ListenerMixin, {
 	// -----------------------------------------------------------------------------------------------------------------
 
 
-	getEventDefByInternalId: function(internalId) {
+	getEventDefByUid: function(uid) {
 		if (this.currentPeriod) {
-			return this.currentPeriod.getEventDefByInternalId(internalId);
+			return this.currentPeriod.getEventDefByUid(uid);
 		}
 	},
 

+ 7 - 7
src/models/EventPeriod.js

@@ -12,7 +12,7 @@ var EventPeriod = Class.extend(EmitterMixin, {
 	stuntedReleaseCnt: 0,
 	releaseCnt: 0,
 
-	eventDefsByInternalId: null,
+	eventDefsByUid: null,
 	eventDefsById: null,
 	eventInstancesById: null,
 	eventRangeGroupsById: null,
@@ -23,7 +23,7 @@ var EventPeriod = Class.extend(EmitterMixin, {
 		this.end = end;
 		this.timezone = timezone;
 		this.requests = [];
-		this.eventDefsByInternalId = {};
+		this.eventDefsByUid = {};
 		this.eventDefsById = {};
 		this.eventInstancesById = {};
 		this.eventRangeGroupsById = {};
@@ -106,8 +106,8 @@ var EventPeriod = Class.extend(EmitterMixin, {
 	// -----------------------------------------------------------------------------------------------------------------
 
 
-	getEventDefByInternalId: function(eventDefInternalId) {
-		return this.eventDefsByInternalId[eventDefInternalId];
+	getEventDefByUid: function(eventDefUid) {
+		return this.eventDefsByUid[eventDefUid];
 	},
 
 
@@ -148,7 +148,7 @@ var EventPeriod = Class.extend(EmitterMixin, {
 
 		eventDefs.push(eventDef);
 
-		this.eventDefsByInternalId[eventDef.internalId] = eventDef;
+		this.eventDefsByUid[eventDef.uid] = eventDef;
 
 		for (i = 0; i < eventInstances.length; i++) {
 			this.addEventInstance(eventInstances[i], eventDefId);
@@ -177,7 +177,7 @@ var EventPeriod = Class.extend(EmitterMixin, {
 
 
 	removeAllEventDefs: function() {
-		this.eventDefsByInternalId = {};
+		this.eventDefsByUid = {};
 		this.eventDefsById = {};
 		this.eventInstancesById = {};
 		this.eventRangeGroupsById = {};
@@ -189,7 +189,7 @@ var EventPeriod = Class.extend(EmitterMixin, {
 		var eventDefsById = this.eventDefsById;
 		var eventDefs = eventDefsById[eventDef.id];
 
-		delete this.eventDefsByInternalId[eventDef.internalId];
+		delete this.eventDefsByUid[eventDef.uid];
 
 		if (eventDefs) {
 			removeExact(eventDefs, eventDef);

+ 4 - 4
src/models/event/EventDef.js

@@ -5,7 +5,7 @@ var EventDef = Class.extend({
 
 	id: null, // normalized supplied ID
 	rawId: null, // unnormalized supplied ID
-	internalId: null, // internal ID. new ID for every definition
+	uid: null, // internal ID. new ID for every definition
 
 	title: null,
 	rendering: null,
@@ -36,7 +36,7 @@ var EventDef = Class.extend({
 
 		copy.id = this.id;
 		copy.rawId = this.rawId;
-		copy.internalId = this.internalId;
+		copy.uid = this.uid;
 
 		copy.title = this.title;
 		copy.rendering = this.rendering;
@@ -97,7 +97,7 @@ var EventDef = Class.extend({
 
 	toLegacy: function() {
 		var obj = {
-			_id: this.internalId,
+			_id: this.uid,
 			source: this.source,
 			className: this.className // should clone?
 		};
@@ -183,7 +183,7 @@ EventDef.parse = function(rawProps, source) {
 		def.id = EventDef.generateId();
 	}
 
-	def.internalId = String(EventDef.uuid++);
+	def.uid = String(EventDef.uuid++);
 	def.title = rawProps.title || '';
 	def.rendering = rawProps.rendering || null;
 	def.constraint = rawProps.constraint || null;