Regenerated

browser/static/compat-pubnub.js

@@ -234,7 +234,7 @@
 					var h = result[i];
 					if (!startTime)
 						startTime = endTime = h.timestamp;
-					presults.push(h.data);
+					presults.push(JSON.parse(h.data));
 				}
 				callback([presults, startTime, endTime]);
 			}
@@ -281,7 +281,7 @@
 	 */
 	PUBNUB.publish = function(args, callback) {
 		callback = callback || args.callback || noop;
-		var message = args.message;
+		var message = JSON.stringify(args.message);
 		var channel = args.channel;
 		var error = args.error || noop;
 		var timestamp = Date.now();
@@ -371,7 +371,16 @@
 
 		var subscr = function(channel, callback, args) {
 			if(subscriptions[channel]) return log('Already Connected');
-			var cb = function(message) { callback(message.data); };
+			var cb = function(message) {
+				var data;
+				try {
+					data = JSON.parse(message.data);
+				} catch(e) {
+					log('PUBNUB.subscribe: Error: '+e);
+					return;
+				}
+				callback(data);
+			};
 
 			// Create channel and register for message callbacks and presence events if necessary
 			var ablyChannel = getChannel(channel);

browser/static/compat-pusher.js

@@ -620,7 +620,7 @@ var Utils = (function() {
 
 		this.channel.subscribe(function(message) {
 			log('PusherChannel::message callback: Event object '+JSON.stringify(this)+', message '+JSON.stringify(message));
-			self.channel.emit(message.name, message.data);
+			self.channel.emit(message.name, JSON.parse(message.data));
 		});
 		this.bindings = {};
 		this.bind_alls = [];
@@ -744,7 +744,8 @@ var Utils = (function() {
 	 * whether or not the trigger was successful.
 	 */
 	PusherChannel.prototype.trigger = function(event, data) {
-		log('PusherChannel::trigger: Event '+event+', data '+JSON.stringify(data));
+		data = JSON.stringify(data);
+		log('PusherChannel::trigger: Event '+event+', data '+ data);
 		if (!this.active) { log('PusherChannel::trigger: Inactive'); return true; }
 		this.channel.publish(event, data);
 		return true;

browser/static/iframe.js

@@ -623,14 +623,8 @@ var XHRRequest = (function() {
 		return false;
 	};
 
-	function responseHeaders(xhr) {
-		var headers = {};
-		if(xhr.getResponseHeader) {
-			var contentType = xhr.getResponseHeader('Content-Type');
-			if(contentType)
-				headers['Content-Type'] = contentType;
-		}
-		return headers;
+	function getContentType(xhr) {
+		return xhr.getResponseHeader && xhr.getResponseHeader('Content-Type');
 	}
 
 	function XHRRequest(uri, headers, params, body, requestMode) {
@@ -651,13 +645,12 @@ var XHRRequest = (function() {
 		return xhrSupported ? new XHRRequest(uri, headers, params, body, requestMode) : new XDRRequest(uri, headers, params, body, requestMode);
 	};
 
-	XHRRequest.prototype.complete = function(err, body) {
+	XHRRequest.prototype.complete = function(err, body, headers, unpacked) {
 		if(!this.requestComplete) {
 			this.requestComplete = true;
-			var xhr = this.xhr;
 			if(body)
 				this.emit('data', body);
-			this.emit('complete', err, body, (xhr && responseHeaders(xhr)));
+			this.emit('complete', err, body, headers, unpacked);
 			this.dispose();
 		}
 	};
@@ -705,8 +698,10 @@ var XHRRequest = (function() {
 		var streaming,
 			statusCode,
 			responseBody,
+			contentType,
 			successResponse,
-			streamPos = 0;
+			streamPos = 0,
+			unpacked = false;
 
 		function onResponse() {
 			clearTimeout(timer);
@@ -729,7 +724,12 @@ var XHRRequest = (function() {
 					}
 					return;
 				}
-				responseBody = JSON.parse(String(responseBody));
+
+				var json = ((contentType = getContentType(xhr)) == 'application/json');
+				if(json) {
+					responseBody = JSON.parse(String(responseBody));
+					unpacked = true;
+				}
 			} catch(e) {
 				var err = new Error('Malformed response body from server: ' + e.message);
 				err.statusCode = 400;
@@ -738,7 +738,7 @@ var XHRRequest = (function() {
 			}
 
 			if(successResponse) {
-				self.complete(null, responseBody);
+				self.complete(null, responseBody, (contentType && {'Content-Type': contentType}), unpacked);
 				return;
 			}
 
@@ -919,7 +919,7 @@ var XHRRequest = (function() {
 				self.complete(err);
 				return;
 			}
-			self.complete(null, responseBody);
+			self.complete(null, responseBody, {'Content-Type': 'application/json'}, true);
 		}
 
 		function onProgress() {
@@ -1002,7 +1002,7 @@ var XHRRequest = (function() {
 		DomEvent.addUnloadListener(clearPendingRequests);
 		if(typeof(Http) !== 'undefined') {
 			Http.supportsAuthHeaders = xhrSupported;
-			Http.Request = function(uri, headers, params, body, format, callback) {
+			Http.Request = function(uri, headers, params, body, callback) {
 				var req = createRequest(uri, headers, params, body, REQ_SEND);
 				req.once('complete', callback);
 				req.exec();