From 9c0b9bc56124a97701505349ebb6ae1e0d5af21f Mon Sep 17 00:00:00 2001
From: Sneha Mishra <33183263+Tlazypanda@users.noreply.github.com>
Date: Wed, 19 Aug 2020 01:10:49 +0530
Subject: [PATCH] replace leaflet files from assets.rb in questionRich.html and
 _mapDependencies.html (#7945)

---
 app/assets/stylesheets/application.css  |  2 +-
 app/views/editor/questionRich.html.erb  | 10 ++--------
 app/views/map/_mapDependencies.html.erb |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 876682255a..3bb720c976 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -39,4 +39,4 @@
  *= require location
  *= require notes
  *= require spam2
-*/
\ No newline at end of file
+*/
diff --git a/app/views/editor/questionRich.html.erb b/app/views/editor/questionRich.html.erb
index 19c9c0a9f7..2396a4785a 100644
--- a/app/views/editor/questionRich.html.erb
+++ b/app/views/editor/questionRich.html.erb
@@ -5,10 +5,8 @@
 <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 -->
@@ -16,10 +14,6 @@
 <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="pl-editor" style="width:100%;">
diff --git a/app/views/map/_mapDependencies.html.erb b/app/views/map/_mapDependencies.html.erb
index 70e00eb04d..f060d7031c 100644
--- 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') %>