normalized yql response which introduced a *result* into headers, tha…

…nks @souders for the catch
amadero · Mar 3, 2013 · 1ddc98a · 1ddc98a
1 parent d74ed20
commit 1ddc98a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.1.6
+-------------
+* Fixed bookmarklet yql response *result* on headers. Thanks @souders
+
 Version 3.1.5
 -------------
 * Added onerror handler to PhantomJS

diff --git a/src/bookmarklet/controller.js b/src/bookmarklet/controller.js
@@ -225,6 +225,9 @@ YUI().use(function (iY) {
                     arrayEach(redir, function (red) {
                         var headers = {};
 
+                        // normalize headers, yql introduced result in response
+                        red.headers = red.headers.result || red.headers;
+
                         objEach(red.headers, function (value, key) {
                             headers[key.toLowerCase()] = value;
                         });
@@ -242,6 +245,9 @@ YUI().use(function (iY) {
                 }
                 comp.href = comp.url = v.url;
 
+                // normalize headers, yql introduced result in response
+                v.headers = v.headers.result || v.headers;
+
                 // build raw headers
                 objEach(v.headers, function (v, k) {
                     rawHeaders += k + ': ' + v + '\n';