Merge pull request #7 from dcartoon/master

Adding Cross-Domain support via JSONP
jondot · Apr 22, 2012 · e7082ea · e7082ea · mromaine · Apr 23, 2012
2 parents e25b93d + 6aa6fd2
commit e7082ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/js/graphene.coffee b/app/js/graphene.coffee
@@ -59,10 +59,19 @@ class Graphene.GraphiteModel extends Backbone.Model
     clearInterval(@t_index)
 
   refresh: ()=>
-    d3.json @get('source'),
-      (js) =>
+    url = @get('source')
+    #jQuery expects to see 'jsonp=?' in the url in order to perform JSONP-style requests
+    if -1 == url.indexOf('&jsonp=?')
+        url = url + '&jsonp=?'
+
+    options =
+      url: url
+      dataType: 'json'
+      jsonp: 'jsonp'
+      success: (js) =>
         console.log("got data.")
         @process_data(js)
+    $.ajax options         
 
   process_data: ()=>
     return null