From bdb41bea7b4db6e97611a8303e4880e580334a74 Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Wed, 10 Mar 2021 14:34:33 +0100
Subject: [PATCH] [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
---
 searx/static/js/require-2.1.15.min.js         | 36 -------
 searx/static/themes/oscar/js/searx.js         | 94 +++++++------------
 searx/static/themes/oscar/js/searx.min.js     |  2 +-
 searx/static/themes/oscar/js/searx.min.js.map |  2 +-
 .../oscar/js/searx_src/00_requirejs_config.js | 23 -----
 .../themes/oscar/js/searx_src/leaflet_map.js  | 71 +++++++-------
 searx/templates/oscar/base.html               | 11 ++-
 7 files changed, 76 insertions(+), 163 deletions(-)
 delete mode 100644 searx/static/js/require-2.1.15.min.js
 delete mode 100644 searx/static/themes/oscar/js/searx_src/00_requirejs_config.js

diff --git a/searx/static/js/require-2.1.15.min.js b/searx/static/js/require-2.1.15.min.js
deleted file mode 100644
index be103a74e..000000000
--- a/searx/static/js/require-2.1.15.min.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
- Available via the MIT or new BSD license.
- see: http://github.com/jrburke/requirejs for details
-*/
-var requirejs,require,define;
-(function(ba){function G(b){return"[object Function]"===K.call(b)}function H(b){return"[object Array]"===K.call(b)}function v(b,c){if(b){var d;for(d=0;d<b.length&&(!b[d]||!c(b[d],d,b));d+=1);}}function T(b,c){if(b){var d;for(d=b.length-1;-1<d&&(!b[d]||!c(b[d],d,b));d-=1);}}function t(b,c){return fa.call(b,c)}function m(b,c){return t(b,c)&&b[c]}function B(b,c){for(var d in b)if(t(b,d)&&c(b[d],d))break}function U(b,c,d,e){c&&B(c,function(c,g){if(d||!t(b,g))e&&"object"===typeof c&&c&&!H(c)&&!G(c)&&!(c instanceof
-RegExp)?(b[g]||(b[g]={}),U(b[g],c,d,e)):b[g]=c});return b}function u(b,c){return function(){return c.apply(b,arguments)}}function ca(b){throw b;}function da(b){if(!b)return b;var c=ba;v(b.split("."),function(b){c=c[b]});return c}function C(b,c,d,e){c=Error(c+"\nhttp://requirejs.org/docs/errors.html#"+b);c.requireType=b;c.requireModules=e;d&&(c.originalError=d);return c}function ga(b){function c(a,k,b){var f,l,c,d,e,g,i,p,k=k&&k.split("/"),h=j.map,n=h&&h["*"];if(a){a=a.split("/");l=a.length-1;j.nodeIdCompat&&
-Q.test(a[l])&&(a[l]=a[l].replace(Q,""));"."===a[0].charAt(0)&&k&&(l=k.slice(0,k.length-1),a=l.concat(a));l=a;for(c=0;c<l.length;c++)if(d=l[c],"."===d)l.splice(c,1),c-=1;else if(".."===d&&!(0===c||1==c&&".."===l[2]||".."===l[c-1])&&0<c)l.splice(c-1,2),c-=2;a=a.join("/")}if(b&&h&&(k||n)){l=a.split("/");c=l.length;a:for(;0<c;c-=1){e=l.slice(0,c).join("/");if(k)for(d=k.length;0<d;d-=1)if(b=m(h,k.slice(0,d).join("/")))if(b=m(b,e)){f=b;g=c;break a}!i&&(n&&m(n,e))&&(i=m(n,e),p=c)}!f&&i&&(f=i,g=p);f&&(l.splice(0,
-g,f),a=l.join("/"))}return(f=m(j.pkgs,a))?f:a}function d(a){z&&v(document.getElementsByTagName("script"),function(k){if(k.getAttribute("data-requiremodule")===a&&k.getAttribute("data-requirecontext")===i.contextName)return k.parentNode.removeChild(k),!0})}function e(a){var k=m(j.paths,a);if(k&&H(k)&&1<k.length)return k.shift(),i.require.undef(a),i.makeRequire(null,{skipMap:!0})([a]),!0}function n(a){var k,c=a?a.indexOf("!"):-1;-1<c&&(k=a.substring(0,c),a=a.substring(c+1,a.length));return[k,a]}function p(a,
-k,b,f){var l,d,e=null,g=k?k.name:null,j=a,p=!0,h="";a||(p=!1,a="_@r"+(K+=1));a=n(a);e=a[0];a=a[1];e&&(e=c(e,g,f),d=m(r,e));a&&(e?h=d&&d.normalize?d.normalize(a,function(a){return c(a,g,f)}):-1===a.indexOf("!")?c(a,g,f):a:(h=c(a,g,f),a=n(h),e=a[0],h=a[1],b=!0,l=i.nameToUrl(h)));b=e&&!d&&!b?"_unnormalized"+(O+=1):"";return{prefix:e,name:h,parentMap:k,unnormalized:!!b,url:l,originalName:j,isDefine:p,id:(e?e+"!"+h:h)+b}}function s(a){var k=a.id,b=m(h,k);b||(b=h[k]=new i.Module(a));return b}function q(a,
-k,b){var f=a.id,c=m(h,f);if(t(r,f)&&(!c||c.defineEmitComplete))"defined"===k&&b(r[f]);else if(c=s(a),c.error&&"error"===k)b(c.error);else c.on(k,b)}function w(a,b){var c=a.requireModules,f=!1;if(b)b(a);else if(v(c,function(b){if(b=m(h,b))b.error=a,b.events.error&&(f=!0,b.emit("error",a))}),!f)g.onError(a)}function x(){R.length&&(ha.apply(A,[A.length,0].concat(R)),R=[])}function y(a){delete h[a];delete V[a]}function F(a,b,c){var f=a.map.id;a.error?a.emit("error",a.error):(b[f]=!0,v(a.depMaps,function(f,
-d){var e=f.id,g=m(h,e);g&&(!a.depMatched[d]&&!c[e])&&(m(b,e)?(a.defineDep(d,r[e]),a.check()):F(g,b,c))}),c[f]=!0)}function D(){var a,b,c=(a=1E3*j.waitSeconds)&&i.startTime+a<(new Date).getTime(),f=[],l=[],g=!1,h=!0;if(!W){W=!0;B(V,function(a){var i=a.map,j=i.id;if(a.enabled&&(i.isDefine||l.push(a),!a.error))if(!a.inited&&c)e(j)?g=b=!0:(f.push(j),d(j));else if(!a.inited&&(a.fetched&&i.isDefine)&&(g=!0,!i.prefix))return h=!1});if(c&&f.length)return a=C("timeout","Load timeout for modules: "+f,null,
-f),a.contextName=i.contextName,w(a);h&&v(l,function(a){F(a,{},{})});if((!c||b)&&g)if((z||ea)&&!X)X=setTimeout(function(){X=0;D()},50);W=!1}}function E(a){t(r,a[0])||s(p(a[0],null,!0)).init(a[1],a[2])}function I(a){var a=a.currentTarget||a.srcElement,b=i.onScriptLoad;a.detachEvent&&!Y?a.detachEvent("onreadystatechange",b):a.removeEventListener("load",b,!1);b=i.onScriptError;(!a.detachEvent||Y)&&a.removeEventListener("error",b,!1);return{node:a,id:a&&a.getAttribute("data-requiremodule")}}function J(){var a;
-for(x();A.length;){a=A.shift();if(null===a[0])return w(C("mismatch","Mismatched anonymous define() module: "+a[a.length-1]));E(a)}}var W,Z,i,L,X,j={waitSeconds:7,baseUrl:"./",paths:{},bundles:{},pkgs:{},shim:{},config:{}},h={},V={},$={},A=[],r={},S={},aa={},K=1,O=1;L={require:function(a){return a.require?a.require:a.require=i.makeRequire(a.map)},exports:function(a){a.usingExports=!0;if(a.map.isDefine)return a.exports?r[a.map.id]=a.exports:a.exports=r[a.map.id]={}},module:function(a){return a.module?
-a.module:a.module={id:a.map.id,uri:a.map.url,config:function(){return m(j.config,a.map.id)||{}},exports:a.exports||(a.exports={})}}};Z=function(a){this.events=m($,a.id)||{};this.map=a;this.shim=m(j.shim,a.id);this.depExports=[];this.depMaps=[];this.depMatched=[];this.pluginMaps={};this.depCount=0};Z.prototype={init:function(a,b,c,f){f=f||{};if(!this.inited){this.factory=b;if(c)this.on("error",c);else this.events.error&&(c=u(this,function(a){this.emit("error",a)}));this.depMaps=a&&a.slice(0);this.errback=
-c;this.inited=!0;this.ignore=f.ignore;f.enabled||this.enabled?this.enable():this.check()}},defineDep:function(a,b){this.depMatched[a]||(this.depMatched[a]=!0,this.depCount-=1,this.depExports[a]=b)},fetch:function(){if(!this.fetched){this.fetched=!0;i.startTime=(new Date).getTime();var a=this.map;if(this.shim)i.makeRequire(this.map,{enableBuildCallback:!0})(this.shim.deps||[],u(this,function(){return a.prefix?this.callPlugin():this.load()}));else return a.prefix?this.callPlugin():this.load()}},load:function(){var a=
-this.map.url;S[a]||(S[a]=!0,i.load(this.map.id,a))},check:function(){if(this.enabled&&!this.enabling){var a,b,c=this.map.id;b=this.depExports;var f=this.exports,l=this.factory;if(this.inited)if(this.error)this.emit("error",this.error);else{if(!this.defining){this.defining=!0;if(1>this.depCount&&!this.defined){if(G(l)){if(this.events.error&&this.map.isDefine||g.onError!==ca)try{f=i.execCb(c,l,b,f)}catch(d){a=d}else f=i.execCb(c,l,b,f);this.map.isDefine&&void 0===f&&((b=this.module)?f=b.exports:this.usingExports&&
-(f=this.exports));if(a)return a.requireMap=this.map,a.requireModules=this.map.isDefine?[this.map.id]:null,a.requireType=this.map.isDefine?"define":"require",w(this.error=a)}else f=l;this.exports=f;if(this.map.isDefine&&!this.ignore&&(r[c]=f,g.onResourceLoad))g.onResourceLoad(i,this.map,this.depMaps);y(c);this.defined=!0}this.defining=!1;this.defined&&!this.defineEmitted&&(this.defineEmitted=!0,this.emit("defined",this.exports),this.defineEmitComplete=!0)}}else this.fetch()}},callPlugin:function(){var a=
-this.map,b=a.id,d=p(a.prefix);this.depMaps.push(d);q(d,"defined",u(this,function(f){var l,d;d=m(aa,this.map.id);var e=this.map.name,P=this.map.parentMap?this.map.parentMap.name:null,n=i.makeRequire(a.parentMap,{enableBuildCallback:!0});if(this.map.unnormalized){if(f.normalize&&(e=f.normalize(e,function(a){return c(a,P,!0)})||""),f=p(a.prefix+"!"+e,this.map.parentMap),q(f,"defined",u(this,function(a){this.init([],function(){return a},null,{enabled:!0,ignore:!0})})),d=m(h,f.id)){this.depMaps.push(f);
-if(this.events.error)d.on("error",u(this,function(a){this.emit("error",a)}));d.enable()}}else d?(this.map.url=i.nameToUrl(d),this.load()):(l=u(this,function(a){this.init([],function(){return a},null,{enabled:!0})}),l.error=u(this,function(a){this.inited=!0;this.error=a;a.requireModules=[b];B(h,function(a){0===a.map.id.indexOf(b+"_unnormalized")&&y(a.map.id)});w(a)}),l.fromText=u(this,function(f,c){var d=a.name,e=p(d),P=M;c&&(f=c);P&&(M=!1);s(e);t(j.config,b)&&(j.config[d]=j.config[b]);try{g.exec(f)}catch(h){return w(C("fromtexteval",
-"fromText eval for "+b+" failed: "+h,h,[b]))}P&&(M=!0);this.depMaps.push(e);i.completeLoad(d);n([d],l)}),f.load(a.name,n,l,j))}));i.enable(d,this);this.pluginMaps[d.id]=d},enable:function(){V[this.map.id]=this;this.enabling=this.enabled=!0;v(this.depMaps,u(this,function(a,b){var c,f;if("string"===typeof a){a=p(a,this.map.isDefine?this.map:this.map.parentMap,!1,!this.skipMap);this.depMaps[b]=a;if(c=m(L,a.id)){this.depExports[b]=c(this);return}this.depCount+=1;q(a,"defined",u(this,function(a){this.defineDep(b,
-a);this.check()}));this.errback&&q(a,"error",u(this,this.errback))}c=a.id;f=h[c];!t(L,c)&&(f&&!f.enabled)&&i.enable(a,this)}));B(this.pluginMaps,u(this,function(a){var b=m(h,a.id);b&&!b.enabled&&i.enable(a,this)}));this.enabling=!1;this.check()},on:function(a,b){var c=this.events[a];c||(c=this.events[a]=[]);c.push(b)},emit:function(a,b){v(this.events[a],function(a){a(b)});"error"===a&&delete this.events[a]}};i={config:j,contextName:b,registry:h,defined:r,urlFetched:S,defQueue:A,Module:Z,makeModuleMap:p,
-nextTick:g.nextTick,onError:w,configure:function(a){a.baseUrl&&"/"!==a.baseUrl.charAt(a.baseUrl.length-1)&&(a.baseUrl+="/");var b=j.shim,c={paths:!0,bundles:!0,config:!0,map:!0};B(a,function(a,b){c[b]?(j[b]||(j[b]={}),U(j[b],a,!0,!0)):j[b]=a});a.bundles&&B(a.bundles,function(a,b){v(a,function(a){a!==b&&(aa[a]=b)})});a.shim&&(B(a.shim,function(a,c){H(a)&&(a={deps:a});if((a.exports||a.init)&&!a.exportsFn)a.exportsFn=i.makeShimExports(a);b[c]=a}),j.shim=b);a.packages&&v(a.packages,function(a){var b,
-a="string"===typeof a?{name:a}:a;b=a.name;a.location&&(j.paths[b]=a.location);j.pkgs[b]=a.name+"/"+(a.main||"main").replace(ia,"").replace(Q,"")});B(h,function(a,b){!a.inited&&!a.map.unnormalized&&(a.map=p(b))});if(a.deps||a.callback)i.require(a.deps||[],a.callback)},makeShimExports:function(a){return function(){var b;a.init&&(b=a.init.apply(ba,arguments));return b||a.exports&&da(a.exports)}},makeRequire:function(a,e){function j(c,d,m){var n,q;e.enableBuildCallback&&(d&&G(d))&&(d.__requireJsBuild=
-!0);if("string"===typeof c){if(G(d))return w(C("requireargs","Invalid require call"),m);if(a&&t(L,c))return L[c](h[a.id]);if(g.get)return g.get(i,c,a,j);n=p(c,a,!1,!0);n=n.id;return!t(r,n)?w(C("notloaded",'Module name "'+n+'" has not been loaded yet for context: '+b+(a?"":". Use require([])"))):r[n]}J();i.nextTick(function(){J();q=s(p(null,a));q.skipMap=e.skipMap;q.init(c,d,m,{enabled:!0});D()});return j}e=e||{};U(j,{isBrowser:z,toUrl:function(b){var d,e=b.lastIndexOf("."),k=b.split("/")[0];if(-1!==
-e&&(!("."===k||".."===k)||1<e))d=b.substring(e,b.length),b=b.substring(0,e);return i.nameToUrl(c(b,a&&a.id,!0),d,!0)},defined:function(b){return t(r,p(b,a,!1,!0).id)},specified:function(b){b=p(b,a,!1,!0).id;return t(r,b)||t(h,b)}});a||(j.undef=function(b){x();var c=p(b,a,!0),e=m(h,b);d(b);delete r[b];delete S[c.url];delete $[b];T(A,function(a,c){a[0]===b&&A.splice(c,1)});e&&(e.events.defined&&($[b]=e.events),y(b))});return j},enable:function(a){m(h,a.id)&&s(a).enable()},completeLoad:function(a){var b,
-c,d=m(j.shim,a)||{},g=d.exports;for(x();A.length;){c=A.shift();if(null===c[0]){c[0]=a;if(b)break;b=!0}else c[0]===a&&(b=!0);E(c)}c=m(h,a);if(!b&&!t(r,a)&&c&&!c.inited){if(j.enforceDefine&&(!g||!da(g)))return e(a)?void 0:w(C("nodefine","No define call for "+a,null,[a]));E([a,d.deps||[],d.exportsFn])}D()},nameToUrl:function(a,b,c){var d,e,h;(d=m(j.pkgs,a))&&(a=d);if(d=m(aa,a))return i.nameToUrl(d,b,c);if(g.jsExtRegExp.test(a))d=a+(b||"");else{d=j.paths;a=a.split("/");for(e=a.length;0<e;e-=1)if(h=a.slice(0,
-e).join("/"),h=m(d,h)){H(h)&&(h=h[0]);a.splice(0,e,h);break}d=a.join("/");d+=b||(/^data\:|\?/.test(d)||c?"":".js");d=("/"===d.charAt(0)||d.match(/^[\w\+\.\-]+:/)?"":j.baseUrl)+d}return j.urlArgs?d+((-1===d.indexOf("?")?"?":"&")+j.urlArgs):d},load:function(a,b){g.load(i,a,b)},execCb:function(a,b,c,d){return b.apply(d,c)},onScriptLoad:function(a){if("load"===a.type||ja.test((a.currentTarget||a.srcElement).readyState))N=null,a=I(a),i.completeLoad(a.id)},onScriptError:function(a){var b=I(a);if(!e(b.id))return w(C("scripterror",
-"Script error for: "+b.id,a,[b.id]))}};i.require=i.makeRequire();return i}var g,x,y,D,I,E,N,J,s,O,ka=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,la=/[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,Q=/\.js$/,ia=/^\.\//;x=Object.prototype;var K=x.toString,fa=x.hasOwnProperty,ha=Array.prototype.splice,z=!!("undefined"!==typeof window&&"undefined"!==typeof navigator&&window.document),ea=!z&&"undefined"!==typeof importScripts,ja=z&&"PLAYSTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/,
-Y="undefined"!==typeof opera&&"[object Opera]"===opera.toString(),F={},q={},R=[],M=!1;if("undefined"===typeof define){if("undefined"!==typeof requirejs){if(G(requirejs))return;q=requirejs;requirejs=void 0}"undefined"!==typeof require&&!G(require)&&(q=require,require=void 0);g=requirejs=function(b,c,d,e){var n,p="_";!H(b)&&"string"!==typeof b&&(n=b,H(c)?(b=c,c=d,d=e):b=[]);n&&n.context&&(p=n.context);(e=m(F,p))||(e=F[p]=g.s.newContext(p));n&&e.configure(n);return e.require(b,c,d)};g.config=function(b){return g(b)};
-g.nextTick="undefined"!==typeof setTimeout?function(b){setTimeout(b,4)}:function(b){b()};require||(require=g);g.version="2.1.15";g.jsExtRegExp=/^\/|:|\?|\.js$/;g.isBrowser=z;x=g.s={contexts:F,newContext:ga};g({});v(["toUrl","undef","defined","specified"],function(b){g[b]=function(){var c=F._;return c.require[b].apply(c,arguments)}});if(z&&(y=x.head=document.getElementsByTagName("head")[0],D=document.getElementsByTagName("base")[0]))y=x.head=D.parentNode;g.onError=ca;g.createNode=function(b){var c=
-b.xhtml?document.createElementNS("http://www.w3.org/1999/xhtml","html:script"):document.createElement("script");c.type=b.scriptType||"text/javascript";c.charset="utf-8";c.async=!0;return c};g.load=function(b,c,d){var e=b&&b.config||{};if(z)return e=g.createNode(e,c,d),e.setAttribute("data-requirecontext",b.contextName),e.setAttribute("data-requiremodule",c),e.attachEvent&&!(e.attachEvent.toString&&0>e.attachEvent.toString().indexOf("[native code"))&&!Y?(M=!0,e.attachEvent("onreadystatechange",b.onScriptLoad)):
-(e.addEventListener("load",b.onScriptLoad,!1),e.addEventListener("error",b.onScriptError,!1)),e.src=d,J=e,D?y.insertBefore(e,D):y.appendChild(e),J=null,e;if(ea)try{importScripts(d),b.completeLoad(c)}catch(m){b.onError(C("importscripts","importScripts failed for "+c+" at "+d,m,[c]))}};z&&!q.skipDataMain&&T(document.getElementsByTagName("script"),function(b){y||(y=b.parentNode);if(I=b.getAttribute("data-main"))return s=I,q.baseUrl||(E=s.split("/"),s=E.pop(),O=E.length?E.join("/")+"/":"./",q.baseUrl=
-O),s=s.replace(Q,""),g.jsExtRegExp.test(s)&&(s=I),q.deps=q.deps?q.deps.concat(s):[s],!0});define=function(b,c,d){var e,g;"string"!==typeof b&&(d=c,c=b,b=null);H(c)||(d=c,c=null);!c&&G(d)&&(c=[],d.length&&(d.toString().replace(ka,"").replace(la,function(b,d){c.push(d)}),c=(1===d.length?["require"]:["require","exports","module"]).concat(c)));if(M){if(!(e=J))N&&"interactive"===N.readyState||T(document.getElementsByTagName("script"),function(b){if("interactive"===b.readyState)return N=b}),e=N;e&&(b||
-(b=e.getAttribute("data-requiremodule")),g=F[e.getAttribute("data-requirecontext")])}(g?g.defQueue:R).push([b,c,d])};define.amd={jQuery:!0};g.exec=function(b){return eval(b)};g(q)}})(this);
diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js
index 8208ce461..53b1c1696 100644
--- a/searx/static/themes/oscar/js/searx.js
+++ b/searx/static/themes/oscar/js/searx.js
@@ -1,27 +1,4 @@
 /**
- * searx is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * searx is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with searx. If not, see < http://www.gnu.org/licenses/ >.
- *
- * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
- */
-
-requirejs.config({
-    baseUrl: './static/themes/oscar/js',
-    paths: {
-        app: '../app'
-    }
-});
-;/**
  * searx is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -331,59 +308,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);
-            }
+            }    
+        }, 0);
 
-                map.addLayer(osmMapnik);
+        map.addLayer(osmMapnik);
 
-                var baseLayers = {
-             "OSM Mapnik": osmMapnik/*,
-             "OSM Wikimedia": osmWikimedia*/
-            };
+        var baseLayers = {
+            "OSM Mapnik": osmMapnik/*,
+            "OSM Wikimedia": osmWikimedia*/
+        };
 
-            L.control.layers(baseLayers).addTo(map);
+        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 );
diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
index ad96c5c12..e3716b6d7 100644
--- a/searx/static/themes/oscar/js/searx.min.js
+++ b/searx/static/themes/oscar/js/searx.min.js
@@ -1,4 +1,4 @@
 /*! oscar/searx.min.js | 10-03-2021 |   */
 
-requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),window.searx=function(t){"use strict";var e,e=t.currentScript||(e=t.getElementsByTagName("script"))[e.length-1];return{autocompleter:"true"===e.getAttribute("data-autocompleter"),method:e.getAttribute("data-method")}}(document),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){var a="";searx.autocompleter&&($("#q").on("keydown",function(t){13==t.which&&(a=$("#q").val())}),$("#q").typeahead(null,{name:"search-results",displayKey:function(t){return t},source:searx.searchResults.ttAdapter()}),$("#q").bind("typeahead:selected",function(t,e){a&&$("#q").val(a),$("#search_form").submit()}))}),$(document).ready(function(){$("#q.autofocus").focus(),$("#clear_search").click(function(){document.getElementById("q").value=""}),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var t=$(this).data("btn-text-collapsed"),e=$(this).data("btn-text-not-collapsed");""!==t&&""!==e&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(t,e):$(this).html().replace(e,t),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var t="btn-"+$(this).data("btn-class"),e=$(this).data("btn-label-default"),a=$(this).data("btn-label-toggled");""!==a&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(e,a):$(this).html().replace(a,e),$(this).html(new_html)),$(this).toggleClass(t),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var t=$(this).data("target"),e=$(t+" > iframe"),t=e.attr("src");void 0!==t&&!1!==t||e.attr("src",e.data("src"))}),$(".btn-sm").dblclick(function(){var t="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(t),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(t),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))}),$(".nav-tabs").click(function(t){$(t.target).parents("ul").children().attr("aria-selected","false"),$(t.target).parent().attr("aria-selected","true")})}),window.addEventListener("load",function(){$(".infobox").each(function(){var t=$(this).find(".infobox_body");t.prop("scrollHeight")+t.find("img.infobox_part").height()<=t.css("max-height").replace("px","")&&$(this).find(".infobox_toggle").hide()})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(t){var e="https://overpass-api.de/api/interpreter?data=[out:json][timeout:25];(",a=");out meta;",s=$(this).data("osm-id"),n=$(this).data("osm-type"),i=$(this).data("result-table"),o="#"+$(this).data("result-table-loadicon"),r=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(s&&n&&i){var i="#"+i,c=null;switch(n){case"node":c=e+"node("+s+");"+a;break;case"way":c=e+"way("+s+");"+a;break;case"relation":c=e+"relation("+s+");"+a}c&&$.ajax(c).done(function(t){if(t&&t.elements&&t.elements[0]){var e,a=t.elements[0],s=$(i).html();for(e in a.tags)if(null===a.tags.name||-1==r.indexOf(e)){switch(s+="<tr><td>"+e+"</td><td>",e){case"phone":case"fax":s+='<a href="tel:'+a.tags[e].replace(/ /g,"")+'">'+a.tags[e]+"</a>";break;case"email":s+='<a href="mailto:'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"website":case"url":s+='<a href="'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikidata":s+='<a href="https://www.wikidata.org/wiki/'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikipedia":if(-1!=a.tags[e].indexOf(":")){s+='<a href="https://'+a.tags[e].substring(0,a.tags[e].indexOf(":"))+".wikipedia.org/wiki/"+a.tags[e].substring(a.tags[e].indexOf(":")+1)+'">'+a.tags[e]+"</a>";break}default:s+=a.tags[e]}s+="</td></tr>"}$(i).html(s),$(i).removeClass("hidden"),$(o).addClass("hidden")}}).fail(function(){$(o).html($(o).html()+'<p class="text-muted">'+could_not_load+"</p>")})}$(this).off(t)}),$(".searx_init_map").on("click",function(t){var s=$(this).data("leaflet-target"),n=$(this).data("map-lon"),i=$(this).data("map-lat"),o=$(this).data("map-zoom"),r=$(this).data("map-boundingbox"),c=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(t){r&&(southWest=L.latLng(r[0],r[2]),northEast=L.latLng(r[1],r[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";var e=L.map(s),a=new L.TileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});new L.TileLayer("https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});map_bounds?setTimeout(function(){e.fitBounds(map_bounds,{maxZoom:17})},0):n&&i&&(o?e.setView(new L.LatLng(i,n),o):e.setView(new L.LatLng(i,n),8)),e.addLayer(a);a={"OSM Mapnik":a};L.control.layers(a).addTo(e),c&&L.geoJson(c).addTo(e)}),$(this).off(t)})}),$(document).ready(function(){$("#allow-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!1})}),$("#disable-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!0})})});
+window.searx=function(t){"use strict";var e,e=t.currentScript||(e=t.getElementsByTagName("script"))[e.length-1];return{autocompleter:"true"===e.getAttribute("data-autocompleter"),method:e.getAttribute("data-method")}}(document),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){var a="";searx.autocompleter&&($("#q").on("keydown",function(t){13==t.which&&(a=$("#q").val())}),$("#q").typeahead(null,{name:"search-results",displayKey:function(t){return t},source:searx.searchResults.ttAdapter()}),$("#q").bind("typeahead:selected",function(t,e){a&&$("#q").val(a),$("#search_form").submit()}))}),$(document).ready(function(){$("#q.autofocus").focus(),$("#clear_search").click(function(){document.getElementById("q").value=""}),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var t=$(this).data("btn-text-collapsed"),e=$(this).data("btn-text-not-collapsed");""!==t&&""!==e&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(t,e):$(this).html().replace(e,t),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var t="btn-"+$(this).data("btn-class"),e=$(this).data("btn-label-default"),a=$(this).data("btn-label-toggled");""!==a&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(e,a):$(this).html().replace(a,e),$(this).html(new_html)),$(this).toggleClass(t),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var t=$(this).data("target"),e=$(t+" > iframe"),t=e.attr("src");void 0!==t&&!1!==t||e.attr("src",e.data("src"))}),$(".btn-sm").dblclick(function(){var t="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(t),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(t),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))}),$(".nav-tabs").click(function(t){$(t.target).parents("ul").children().attr("aria-selected","false"),$(t.target).parent().attr("aria-selected","true")})}),window.addEventListener("load",function(){$(".infobox").each(function(){var t=$(this).find(".infobox_body");t.prop("scrollHeight")+t.find("img.infobox_part").height()<=t.css("max-height").replace("px","")&&$(this).find(".infobox_toggle").hide()})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(t){var e="https://overpass-api.de/api/interpreter?data=[out:json][timeout:25];(",a=");out meta;",s=$(this).data("osm-id"),n=$(this).data("osm-type"),i=$(this).data("result-table"),o="#"+$(this).data("result-table-loadicon"),r=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(s&&n&&i){var i="#"+i,l=null;switch(n){case"node":l=e+"node("+s+");"+a;break;case"way":l=e+"way("+s+");"+a;break;case"relation":l=e+"relation("+s+");"+a}l&&$.ajax(l).done(function(t){if(t&&t.elements&&t.elements[0]){var e,a=t.elements[0],s=$(i).html();for(e in a.tags)if(null===a.tags.name||-1==r.indexOf(e)){switch(s+="<tr><td>"+e+"</td><td>",e){case"phone":case"fax":s+='<a href="tel:'+a.tags[e].replace(/ /g,"")+'">'+a.tags[e]+"</a>";break;case"email":s+='<a href="mailto:'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"website":case"url":s+='<a href="'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikidata":s+='<a href="https://www.wikidata.org/wiki/'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikipedia":if(-1!=a.tags[e].indexOf(":")){s+='<a href="https://'+a.tags[e].substring(0,a.tags[e].indexOf(":"))+".wikipedia.org/wiki/"+a.tags[e].substring(a.tags[e].indexOf(":")+1)+'">'+a.tags[e]+"</a>";break}default:s+=a.tags[e]}s+="</td></tr>"}$(i).html(s),$(i).removeClass("hidden"),$(o).addClass("hidden")}}).fail(function(){$(o).html($(o).html()+'<p class="text-muted">'+could_not_load+"</p>")})}$(this).off(t)}),$(".searx_init_map").on("click",function(t){var e=$(this).data("leaflet-target"),a=$(this).data("map-lon"),s=$(this).data("map-lat"),n=$(this).data("map-zoom"),i=$(this).data("map-boundingbox"),o=$(this).data("map-geojson");i&&(southWest=L.latLng(i[0],i[2]),northEast=L.latLng(i[1],i[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";var r=L.map(e),e=new L.TileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});new L.TileLayer("https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});setTimeout(function(){map_bounds?r.fitBounds(map_bounds,{maxZoom:17}):a&&s&&(n?r.setView(new L.LatLng(s,a),n):r.setView(new L.LatLng(s,a),8))},0),r.addLayer(e);e={"OSM Mapnik":e};L.control.layers(e).addTo(r),o&&L.geoJson(o).addTo(r),$(this).off(t)})}),$(document).ready(function(){$("#allow-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!1})}),$("#disable-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!0})})});
 //# sourceMappingURL=searx.min.js.map
\ No newline at end of file
diff --git a/searx/static/themes/oscar/js/searx.min.js.map b/searx/static/themes/oscar/js/searx.min.js.map
index 90bd35e3f..8def39456 100644
--- a/searx/static/themes/oscar/js/searx.min.js.map
+++ b/searx/static/themes/oscar/js/searx.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"searx.min.js","sources":["searx.js"],"names":["requirejs","config","baseUrl","paths","app","window","searx","d","scripts","script","currentScript","getElementsByTagName","length","autocompleter","getAttribute","method","document","searchResults","Bloodhound","datumTokenizer","tokenizers","obj","whitespace","queryTokenizer","remote","initialize","$","ready","original_search_value","on","e","which","val","typeahead","name","displayKey","result","source","ttAdapter","bind","ev","suggestion","submit","focus","click","getElementById","value","this","select","btnTextCollapsed","data","btnTextNotCollapsed","new_html","hasClass","html","replace","btnClass","btnLabelDefault","btnLabelToggled","toggleClass","target","iframe_load","srctest","attr","undefined","dblclick","prop","addClass","removeClass","removeAttr","checked","a","parents","children","parent","addEventListener","each","infobox_body","find","height","css","hide","event","query_start","overpass_url","query_end","osm_id","osm_type","result_table","result_table_loadicon","osm_ignore_tags","query","ajax","done","elements","row","element","newHtml","tags","indexOf","substring","fail","could_not_load","off","leaflet_target","map_lon","map_lat","map_zoom","map_boundingbox","map_geojson","require","leaflet","southWest","L","latLng","northEast","map_bounds","latLngBounds","Icon","Default","imagePath","map","osmMapnik","TileLayer","minZoom","maxZoom","attribution","setTimeout","fitBounds","setView","LatLng","addLayer","baseLayers","OSM Mapnik","control","layers","addTo","geoJson"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"searx.min.js","sources":["searx.js"],"names":["window","searx","d","scripts","script","currentScript","getElementsByTagName","length","autocompleter","getAttribute","method","document","searchResults","Bloodhound","datumTokenizer","tokenizers","obj","whitespace","queryTokenizer","remote","initialize","$","ready","original_search_value","on","e","which","val","typeahead","name","displayKey","result","source","ttAdapter","bind","ev","suggestion","submit","focus","click","getElementById","value","this","select","btnTextCollapsed","data","btnTextNotCollapsed","new_html","hasClass","html","replace","btnClass","btnLabelDefault","btnLabelToggled","toggleClass","target","iframe_load","srctest","attr","undefined","dblclick","prop","addClass","removeClass","removeAttr","checked","a","parents","children","parent","addEventListener","each","infobox_body","find","height","css","hide","event","query_start","overpass_url","query_end","osm_id","osm_type","result_table","result_table_loadicon","osm_ignore_tags","query","ajax","done","elements","row","element","newHtml","tags","indexOf","substring","fail","could_not_load","off","leaflet_target","map_lon","map_lat","map_zoom","map_boundingbox","map_geojson","southWest","L","latLng","northEast","map_bounds","latLngBounds","Icon","Default","imagePath","map","osmMapnik","TileLayer","minZoom","maxZoom","attribution","setTimeout","fitBounds","setView","LatLng","addLayer","baseLayers","OSM Mapnik","control","layers","addTo","geoJson"],"mappings":"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"}
\ No newline at end of file
diff --git a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js
deleted file mode 100644
index e7c2abdac..000000000
--- a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * searx is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * searx is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with searx. If not, see < http://www.gnu.org/licenses/ >.
- *
- * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
- */
-
-requirejs.config({
-    baseUrl: './static/themes/oscar/js',
-    paths: {
-        app: '../app'
-    }
-});
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);
-            }
+            }    
+        }, 0);
 
-                map.addLayer(osmMapnik);
+        map.addLayer(osmMapnik);
 
-                var baseLayers = {
-             "OSM Mapnik": osmMapnik/*,
-             "OSM Wikimedia": osmWikimedia*/
-            };
+        var baseLayers = {
+            "OSM Mapnik": osmMapnik/*,
+            "OSM Wikimedia": osmWikimedia*/
+        };
 
-            L.control.layers(baseLayers).addTo(map);
+        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 );
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 2205eb952..033be89b8 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -19,7 +19,12 @@
     {{'    '}}<link rel="stylesheet" href="{{ url_for('static', filename='css/logicodev.min.css') }}" type="text/css" />
     {%- endif %}
 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
+    {% set templates = results|map(attribute='template')|unique|list -%}
+    {%- set load_leaflet = 'map.html' in templates -%}
+    {%- if load_leaflet -%}
+    {{'    '}}<link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
+    {%- endif %}
+
     {%- for css in styles %}
         <link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" />
     {% endfor %}
@@ -96,9 +101,9 @@
     </div>
     <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
-    {% if autocomplete %}    <script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %}
+    {% if load_leaflet %}{{"    "}}<script src="{{ url_for('static', filename='js/leaflet-0.7.3.min.js') }}"></script>{{ "\n" }}{% endif %}
+    {% if autocomplete %}{{"    "}}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{{ "\n" }}{% endif %}
 
-    <script src="{{ url_for('static', filename='js/require-2.1.15.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/searx.min.js') }}"
             data-method="{{ method or 'POST' }}"
             data-autocompleter="{% if autocomplete %}true{% else %}false{% endif %}"></script>