Merge remote-tracking branch 'origin/resourceView-2.1'

src/Calendar.js

@@ -526,7 +526,9 @@ function Calendar(element, instanceOptions) {
 		if (elementVisible()) {
 			freezeContentHeight();
 			currentView.destroyEvents(); // no performance cost if never rendered
-			currentView.renderEvents(events);
+			currentView.renderEvents($.grep(events, function(event) {
+				return event.end > currentView.start && event.start < currentView.end;
+			}));
 			unfreezeContentHeight();
 		}
 	}

src/ResourceManager.js

@@ -48,23 +48,24 @@ function ResourceManager(options) {
    */
 
   function fetchResources(useCache, currentView) {
-    var resources = cache;
+    var resources;
 
     // if useCache is not defined, default to true
     if (useCache || useCache === undefined || cache === undefined) {
       // do a fetch resource from source, rebuild cache
       cache = [];
       var len = resourceSources.length;
       for (var i = 0; i < len; i++) {
-        var resources = fetchResourceSource(resourceSources[i], currentView);
-        cache = cache.concat(resources);
+        cache = cache.concat(fetchResourceSource(resourceSources[i], currentView));
       }
     }
 
     if($.isFunction(options.resourceFilter)) {
       resources = $.grep(cache, options.resourceFilter);
     }
-
+    else {
+      resources = cache;
+    }
 
     if($.isFunction(options.resourceSort)) {
       //todo! does it need to copy array first?

src/resource/ResourceView.js

@@ -12,7 +12,8 @@ ResourceView.prototype = createObject(AgendaView.prototype); // extends AgendaVi
 $.extend(ResourceView.prototype, {
 
 	resources: function() {
-		return this.calendar.fetchResources();
+		this._resources = this._resources || this.calendar.fetchResources();
+		return this._resources;
 	},
 
 	hasResource: function(event, resource) {