Load markerclustererplus from bower since the google code link seems …

…to have died
spinecone · May 14, 2016 · 27d6b57 · 27d6b57
1 parent 04f9f21
commit 27d6b57
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/views/shared/_map.html.erb b/app/views/shared/_map.html.erb
@@ -9,7 +9,7 @@
   end
 %>
 <script src="//maps.google.com/maps/api/js?v=3.18&sensor=false&libraries=geometry"></script>
-<script src='//google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.1.2/markerclustererplus/src/markerclusterer_packed.js'></script>
+<%= javascript_include_tag 'markerclustererplus/dist/markerclusterer.min.js' %>
 
 <script>
   window.whenReady(function () {

diff --git a/bower.json b/bower.json
@@ -1,8 +1,9 @@
 {
-  "name" : "bridge troll",
+  "name": "bridge troll",
   "dependencies": {
     "DataTables": "1.10.10",
-    "select2": "4.0.1"
+    "select2": "4.0.1",
+    "markerclustererplus": "^2.1.4"
   },
   "devDependencies": {
     "sinonjs": "1.17.1"

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -8,4 +8,4 @@
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( markerclustererplus/dist/markerclusterer.min.js )