From 59167716cdb7b5eac7e4b1fba6685f5d03fe4490 Mon Sep 17 00:00:00 2001
From: Adam Shaw <arshaw@arshaw.com>
Date: Sun, 3 Mar 2013 19:22:29 -0800
Subject: [PATCH] modify eventTransform behavior

---
 src/EventManager.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/EventManager.js b/src/EventManager.js
index 44aa44a..d6cbafa 100644
--- a/src/EventManager.js
+++ b/src/EventManager.js
@@ -74,6 +74,14 @@ function EventManager(options, _sources) {
 		_fetchEventSource(source, function(events) {
 			if (fetchID == currentFetchID) {
 				if (events) {
+
+					if (options.eventTransform) {
+						events = $.map(events, options.eventTransform);
+					}
+					if (source.eventTransform) {
+						events = $.map(events, source.eventTransform);
+					}
+				
 					for (var i=0; i<events.length; i++) {
 						events[i].source = source;
 						normalizeEvent(events[i]);
@@ -122,7 +130,6 @@ function EventManager(options, _sources) {
 			}
 		}else{
 			var url = source.url;
-			var eventTransform = source.eventTransform || options.eventTransform;
 			if (url) {
 				var success = source.success;
 				var error = source.error;
@@ -145,9 +152,7 @@ function EventManager(options, _sources) {
 						if ($.isArray(res)) {
 							events = res;
 						}
-						callback(events && eventTransform
-							? $.map(events, eventTransform)
-							: events);
+						callback(events);
 					},
 					error: function() {
 						applyAll(error, this, arguments);