Added new boolean option refetchResources which determines do we fetc…

…h resources every time we get new events. refetchResources adds calendar start and end times to ajax request so we can have different resources in different times.
arenoir · Oct 24, 2012 · 483abaf · 483abaf
1 parent 3eb9e98
commit 483abaf
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/src/Calendar.js b/src/Calendar.js
@@ -319,6 +319,7 @@ function Calendar(element, options, eventSources, resourceSources) {
 	function updateEvents(forceRender) {
 		if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) {
 			refetchEvents();
+			if (options['refetchResources']) refetchResources(); // refetch resources every time new events are loaded
 		}
 		else if (forceRender) {
 			rerenderEvents();
@@ -331,8 +332,8 @@ function Calendar(element, options, eventSources, resourceSources) {
 	}
 
 	function refetchResources() {
-		fetchResources(false);
-		
+		fetchResources(false, currentView);
+
 		// we have to destroy all view instances and recreate current one
 		viewInstances = [];
 

diff --git a/src/ResourceManager.js b/src/ResourceManager.js
@@ -10,7 +10,7 @@ function ResourceManager(options) {
 
     // exports
     t.fetchResources = fetchResources;
-    
+
     // local
     var sources = [];  // source array
     var cache;  // cached resources
@@ -57,7 +57,7 @@ function ResourceManager(options) {
      * Fetch resources from source array
      * ----------------------------------------------------------------
      */
-    function fetchResources(useCache) {
+    function fetchResources(useCache, currentView) {
         // if useCache is not defined, default to true
         useCache = typeof useCache !== 'undefined' ? useCache : true;
 
@@ -69,7 +69,7 @@ function ResourceManager(options) {
             cache = [];
             var len = sources.length;
             for (var i = 0; i < len; i++) {
-                var resources = _fetchResourceSource(sources[i]);
+                var resources = _fetchResourceSource(sources[i], currentView);
                 cache = cache.concat(resources);
             }
             return cache;
@@ -85,17 +85,30 @@ function ResourceManager(options) {
      * object, return it as is.
      * ----------------------------------------------------------------
      */
-    function _fetchResourceSource(source) {
+    function _fetchResourceSource(source, currentView) {
         var resources = source.resources;
+
         if (resources) {
             if ($.isFunction(resources)) {
                 return resources();
             }
         } else {
             var url = source.url;
             if (url) {
-                $.ajax({
-                    url: url,
+                var data={};
+                if (typeof currentView == 'object') {
+                    var startParam = options.startParam;
+                    var endParam = options.endParam;
+                    if (startParam) {
+                        data[startParam] = Math.round(+currentView.visStart / 1000);
+                    }
+                    if (endParam) {
+                        data[endParam] = Math.round(+currentView.visEnd / 1000);
+                    }
+                }
+
+                $.ajax($.extend({}, source, {
+                    data: data,
                     dataType: 'json',
                     cache: false,
                     success: function(res) {
@@ -106,7 +119,7 @@ function ResourceManager(options) {
                         alert("ajax error getting json from "+url);
                     },
                     async: false  // too much work coordinating callbacks so dumb it down
-                });
+                }));
             }
         }
         return resources;

diff --git a/src/defaults.js b/src/defaults.js
@@ -23,6 +23,9 @@ var defaults = {
 	lazyFetching: true,
 	startParam: 'start',
 	endParam: 'end',
+
+	// resource ajax
+	refetchResources: false,
 
 	// time formats
 	titleFormat: {