commit a406119f56aa4f69793cbe852f5821e97518f6d7
author Avery Pennarun <apenwarr@gmail.com> Thu May 09 02:38:10 2013 -0400
committer Avery Pennarun <apenwarr@gmail.com> Thu May 09 02:39:34 2013 -0400
tree 2484dd4feb0399f5c0ee47a86045da386bc3337b
parent 2d4be895f44e48af67da47f51722ee367099f685

Oops, successful gviz loads were always being treated as errors.

Also, so were oauth2 requests.

render.js

diff --git a/render.js b/render.js
index 37ed994..5548452 100644
--- a/render.js
+++ b/render.js
@@ -1640,18 +1640,21 @@
 
   function getUrlData(url, success_func, error_func) {
     console.debug('fetching data url:', url);
-    var successfunc_called;
 
     var iframe = document.createElement('iframe');
     iframe.style.display = 'none';
 
     iframe.onload = function() {
-      // the default jsonp callback
-      iframe.contentWindow.jsonp = function(data) {
+      var successfunc_called;
+      var real_success_func = function(data) {
+        console.debug('calling success_func');
         success_func(data);
         successfunc_called = true;
       }
 
+      // the default jsonp callback
+      iframe.contentWindow.jsonp = real_success_func;
+
       // a callback the jsonp can execute if oauth2 authentication is needed
       iframe.contentWindow.tryOAuth2 = function(oauth2_url) {
         var hostpart = urlMinusPath(oauth2_url);
@@ -1690,6 +1693,7 @@
                          encodeURI(hostpart) +
                          '</b> - sorry.');
         }
+        successfunc_called = true;  // needing oauth2 is "success" in that we know what's up
       };
 
       // some services are hardcoded to use the gviz callback, so
@@ -1697,7 +1701,7 @@
       iframe.contentWindow.google = {
         visualization: {
           Query: {
-            setResponse: success_func
+            setResponse: real_success_func
           }
         }
       };