Merge pull request #6 from pikesley/redis

Include plotly because CDN is borked
pikesley · Jan 1, 2016 · cd3fc53 · cd3fc53
2 parents f0ba776 + 352ee4b
commit cd3fc53
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/lib/assets/javascripts/plotly-latest.min.js b/lib/assets/javascripts/plotly-latest.min.js
diff --git a/lib/dashboard/assets.rb b/lib/dashboard/assets.rb
@@ -10,8 +10,9 @@ class App < Sinatra::Base
     register Sinatra::AssetPack
     assets do
       serve '/js', from: '../assets/javascripts'
-      js :application, [
-        '/js/dashboard.js'
+      js :app, [
+        '/js/dashboard.js',
+        '/js/plotly-latest.min.js'
       ]
 
       serve '/css', from: '../assets/css'

diff --git a/lib/dashboard/racks.rb b/lib/dashboard/racks.rb
@@ -1,9 +1,10 @@
 module Dashboard
   class App < Sinatra::Base
-    use Rack::Conneg  do |conneg|
+    use Rack::Conneg do |conneg|
       conneg.set :accept_all_extensions, false
       conneg.set :fallback, :html
       conneg.ignore('/css/')
+      conneg.ignore('/js/')
       conneg.provide([:html, :json])
     end
 

diff --git a/lib/views/default.erb b/lib/views/default.erb
@@ -12,7 +12,8 @@
       <script src='https://oss.maxcdn.com/respond/1.4.2/respond.min.js'></script>
     <![endif]-->
 
-    <script src='//cdn.plot.ly/plotly-latest.min.js'></script>
+    <!-- <script src='//cdn.plot.ly/plotly-latest.min.js'></script> -->
+    <script src='/js/plotly-latest.min.js'></script>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src='https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'></script>