use google cdn for graph, not local js files

studiospring · Nov 16, 2013 · 6e6bf06 · 6e6bf06
1 parent bcfdaca
commit 6e6bf06
Show file tree

Hide file tree

Showing 4 changed files with 2,869 additions and 5 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,8 +13,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
-//= require jsapi
-//= require visualization
-//= require graph3d-min
+/*//= require jsapi*/
+/*//= require visualization*/
+//= require graph3d
 //= require jquery.validate.min
 //= require_tree .
diff --git a/app/views/pv_queries/_results.html.erb b/app/views/pv_queries/_results.html.erb
@@ -8,3 +8,4 @@ index<% end %>
   <p class="alert alert-warning">Oops. There should be a pretty graph here.</p>
 <% end %>
 <button id="reload_page" type="button" class="btn btn-primary" autofocus="true">Try again</button>
+<script type="text/javascript" src="http://www.google.com/jsapi"></script>
diff --git a/app/views/pv_queries/create.js.coffee b/app/views/pv_queries/create.js.coffee
@@ -3,6 +3,8 @@ ready = ->
   #draw graph# <<<
   data = null
   graph = null
+  google.load("visualization", "1")
+
   #Called when the Visualization API is loaded.
   drawVisualization = () ->
     # Create and populate a data table.
@@ -32,15 +34,15 @@ ready = ->
         verticalRatio: 0.8
         cameraPosition: {"horizontal": 5.6, "vertical": 0.2, "distance": 1.8}
 
+      alert 'before instantiating graph'
       # Instantiate our graph object.
       graph = new links.Graph3d(document.getElementById('output_pa'))
 
+      alert 'before draw'
       # Draw our graph with the created data and options 
       graph.draw(data, options)
-      alert 'end function'
 
   drawVisualization() #>>>
-  alert 'end graph'
 
   $('#reload_page').click ->
     location.reload(true)