Merge pull request #362 from jywarren/tooltip-fixes

Tooltip fixes
publiclab · Apr 26, 2016 · 1f05967 · 1f05967
2 parents 231a18a + 7120f34
commit 1f05967
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/views/spectrums/show2.html.erb b/app/views/spectrums/show2.html.erb
@@ -24,6 +24,7 @@
         // the following will be deprecated for snapshot/tag-based metadata
         calibrated: <%= @spectrum.calibrated %>,
         range: <%= @spectrum.has_powertag('range') ? @spectrum.range : false %>,
+        <% if @spectrum.photo_file_name %>image_url: "<%= @spectrum.photo.url(:original) %>",<% end %>
         sample_row: <%= @spectrum.sample_row %>
       }, function() {
 

diff --git a/bower.json b/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "Spectral Workbench",
-  "version": "2.0.0-beta.2",
+  "version": "2.1.1",
   "dependencies": {
-    "spectral-workbench": "~0.0.7",
+    "spectral-workbench": "~0.0.9",
     "d3": "~3.3.13",
     "nvd3": "~1.7.1",
     "fontawesome": "~4.5.0",
@@ -18,8 +18,6 @@
     "ace-builds": "jywarren/ace-builds#v1.2.4"
   },
   "resolutions": {
-    "d3": "^3.4.4",
-    "nvd3": "~1.8.2",
     "jquery": "~2.1.3"
   }
 }