From 03689f1cc5b4ad2b77acc1d08222987f7930fffc Mon Sep 17 00:00:00 2001 From: Justin Karneges Date: Wed, 30 Jan 2013 17:34:59 -0800 Subject: remove debug define, parse response json-p headers --- polldance.js | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/polldance.js b/polldance.js index 824fba3..c633da7 100644 --- a/polldance.js +++ b/polldance.js @@ -4,8 +4,8 @@ * Released under the MIT license (see COPYING file in source distribution) */ (function () { -/** @define {boolean} */ var DEBUG = true; "use strict"; +var DEBUG = true; (function (window, undefined) { var NAMESPACE = "PollDance"; @@ -48,6 +48,24 @@ } }; + var parseResponseHeaders = function(headerStr) { + var headers = {}; + if (!headerStr) { + return headers; + } + var headerPairs = headerStr.split('\u000d\u000a'); + for (var i = 0; i < headerPairs.length; i++) { + var headerPair = headerPairs[i]; + var index = headerPair.indexOf('\u003a\u0020'); + if (index > 0) { + var key = headerPair.substring(0, index); + var val = headerPair.substring(index + 2); + headers[key] = val; + } + } + return headers; + }; + var jsonCallbacks = { id: 0, requests: {}, @@ -308,8 +326,9 @@ this._retry(); } else { if (xhr.status) { - // TODO: xhr.getAllResponseHeaders() - this._handle_response(xhr.status, xhr.statusText, {}, xhr.responseText); + var headersStr = xhr.getAllResponseHeaders(); + var headers = parseResponseHeaders(headersStr); + this._handle_response(xhr.status, xhr.statusText, headers, xhr.responseText); } else { this._error(errorTypes.TransportError); } -- cgit v1.2.3