[mod] theme: remove require-2.1.15.min.js

See https://github.com/requirejs/requirejs/issues/1816

requirejs loads one file: leaflet.

This commit:
* removes requirejs
* load leaflet using <script src...> HTML tag in searx/templates/oscar/base.html

1 files changed, 33 insertions, 38 deletions

diff --git a/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
index 06931b474..60bf836ce 100644
--- a/searx/static/themes/oscar/js/searx_src/leaflet_map.js
+++ b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
@@ -107,59 +107,54 @@ $(document).ready(function(){
         var map_boundingbox = $(this).data('map-boundingbox');
         var map_geojson = $(this).data('map-geojson');
 
-        require(['leaflet-0.7.3.min'], function(leaflet) {
-            if(map_boundingbox) {
-                southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]);
-                northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]);
-                map_bounds = L.latLngBounds(southWest, northEast);
-            }
+        if(map_boundingbox) {
+            southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]);
+            northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]);
+            map_bounds = L.latLngBounds(southWest, northEast);
+        }
 
-            // TODO hack
-            // change default imagePath
-            L.Icon.Default.imagePath =  "./static/themes/oscar/img/map";
+        // change default imagePath
+        L.Icon.Default.imagePath =  "./static/themes/oscar/img/map";
 
-            // init map
-            var map = L.map(leaflet_target);
+        // init map
+        var map = L.map(leaflet_target);
 
-            // create the tile layer with correct attribution
-            var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
-            var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
-            var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
+        // create the tile layer with correct attribution
+        var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+        var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+        var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
 
-            var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
-            var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
-            var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
+        var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
+        var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+        var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
 
-            // init map view
+        // init map view
+        setTimeout(function() {
             if(map_bounds) {
-                // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021
-                setTimeout(function () {
-                    map.fitBounds(map_bounds, {
-                        maxZoom:17
-                    });
-                }, 0);
+                map.fitBounds(map_bounds, {
+                    maxZoom:17
+                });
             } else if (map_lon && map_lat) {
                 if(map_zoom)
                     map.setView(new L.LatLng(map_lat, map_lon),map_zoom);
                 else
                     map.setView(new L.LatLng(map_lat, map_lon),8);
-            }
-
-                map.addLayer(osmMapnik);
+            }    
+        }, 0);
 
-                var baseLayers = {
-             "OSM Mapnik": osmMapnik/*,
-             "OSM Wikimedia": osmWikimedia*/
-            };
+        map.addLayer(osmMapnik);
 
-            L.control.layers(baseLayers).addTo(map);
+        var baseLayers = {
+            "OSM Mapnik": osmMapnik/*,
+            "OSM Wikimedia": osmWikimedia*/
+        };
 
+        L.control.layers(baseLayers).addTo(map);
 
-            if(map_geojson)
-                L.geoJson(map_geojson).addTo(map);
-            /*else if(map_bounds)
-                L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/
-        });
+        if(map_geojson)
+            L.geoJson(map_geojson).addTo(map);
+        /*else if(map_bounds)
+            L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/
 
         // this event occour only once per element
         $( this ).off( event );