replace leaflet files from assets.rb in questionRich.html and _mapDep…

…endencies.html
publiclab · Jun 29, 2020 · ad8881f · ad8881f
1 parent 9c726fd
commit ad8881f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -36,5 +36,6 @@
  *= require jquery.atwho
  *= require profile
  *= require location
- *= require notes 
+ *= require notes
+ *= require spam2
 */
diff --git a/app/views/editor/questionRich.html.erb b/app/views/editor/questionRich.html.erb
@@ -5,21 +5,15 @@
 <link href="/lib/publiclab-editor/dist/PublicLab.Editor.css" rel="stylesheet">
 
 <!-- required for MapModule -->
-<link href="/lib/leaflet/dist/leaflet.css" rel="stylesheet">
-<script src="/lib/leaflet/dist/leaflet.js"></script>
-<link href="/lib/leaflet-blurred-location/dist/Leaflet.BlurredLocation.css" rel="stylesheet">
-<script src="/lib/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js"></script>
+<%= stylesheet_link_tag "leaflet-blurred-location/dist/Leaflet.BlurredLocation.css" %>
+<%= javascript_include_tag('leaflet-blurred-location/dist/Leaflet.BlurredLocation.js') %>
 <div id="map" class="leaflet-map" style="width: 100% ; height: 300px; margin-bottom:8px;display:none;"></div>
 
 <!-- required for TagsModule -->
 <script src="/lib/typeahead.js/dist/bloodhound.js"></script>
 <script src="/lib/bootstrap-tokenfield/dist/bootstrap-tokenfield.js"></script>
 
 <!-- required for MainImageModule -->
-<script src="/lib/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script>
-<script src="/lib/jquery-file-upload/js/jquery.iframe-transport.js"></script>
-<script src="/lib/jquery-file-upload/js/jquery.fileupload.js"></script>
-
 <script src="/lib/publiclab-editor/dist/PublicLab.Editor.js"></script>
 
 <div class="alert alert-success" style="width: 100%;" >This is the new rich Questions form. <a href="/questions/new?legacy=true">Click here for the legacy form</a>.</div>

diff --git a/app/views/map/_mapDependencies.html.erb b/app/views/map/_mapDependencies.html.erb
@@ -3,7 +3,7 @@
 
 <%= stylesheet_link_tag "/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
 
-<%= javascript_include_tag('/lib/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js') %>
+<%= javascript_include_tag('leaflet-blurred-location/dist/Leaflet.BlurredLocation.js') %>
 <%= javascript_include_tag('/lib/leaflet.blurred-location-display/dist/Leaflet.BlurredLocationDisplay.js') %>
 
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1,5 +1,6 @@
 Rails.application.config.assets.precompile += [
   'leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
+  'leaflet-blurred-location/dist/Leaflet.BlurredLocation.css',
 
   'advanced_search.js',
   'submit_form_ajax.js',