Extract resourceId from eventSource if it exists

fullcalendar · Feb 4, 2018 · dbc63c8 · dbc63c8
1 parent 8cf5f78
commit dbc63c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/models/EventDef.ts b/src/models/EventDef.ts
@@ -37,7 +37,7 @@ once we do away with the deprecated eventResourceField.
 EventDef.prototype.applyMiscProps = function(rawProps) {
   rawProps = $.extend({}, rawProps) // clone, because of delete
 
-  this.resourceIds = Resource.extractIds(rawProps, this.source.calendar)
+  this.resourceIds = Resource.extractIds(rawProps, this.source)
 
   delete rawProps.resourceId
   delete rawProps.resourceIds

diff --git a/src/models/EventSource.ts b/src/models/EventSource.ts
@@ -2,4 +2,5 @@ import { EventSource } from 'fullcalendar'
 
 // defineStandardProps won't work :(
 // TODO: find a better way
-(EventSource.prototype as any).standardPropMap.resourceEditable = true // automatically transfer
+(EventSource.prototype as any).standardPropMap.resourceEditable = true;  // automatically transfer
+(EventSource.prototype as any).standardPropMap.resourceId = true
diff --git a/src/models/Resource.ts b/src/models/Resource.ts
@@ -2,8 +2,8 @@
 export default class Resource {
 
 
-  static extractIds(rawProps, calendar) {
-    const resourceField = calendar.opt('eventResourceField') || 'resourceId'
+  static extractIds(rawProps, source) {
+    const resourceField = source.calendar.opt('eventResourceField') || 'resourceId'
     const resourceIds = []
 
     if (rawProps.resourceIds) {
@@ -16,6 +16,10 @@ export default class Resource {
       resourceIds.push(Resource.normalizeId(rawProps[resourceField]))
     }
 
+    if (source[resourceField]) {
+      resourceIds.push(Resource.normalizeId(source[resourceField]))
+    }
+
     return resourceIds
   }