[mod] simple theme: autocomplete-js becomes a packages.json dependency

Update to version 2.7.1

searx/static/themes/simple/gruntfile.js

@@ -65,7 +65,7 @@ module.exports = function(grunt) {
         },
         files: {
           'js/searx.head.js': ['src/js/head/*.js'],
-          'js/searx.js': ['src/js/main/*.js', '../__common__/js/*.js', 'js/autocomplete.js']
+          'js/searx.js': ['src/js/main/*.js', '../__common__/js/*.js', './node_modules/autocomplete-js/dist/autocomplete.js']
         }
       }
     },

searx/static/themes/simple/js/autocomplete.js

@@ -1,536 +0,0 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.AutoComplete = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/*
- * @license MIT
- *
- * Autocomplete.js v2.6.3
- * Developed by Baptiste Donaux
- * http://autocomplete-js.com
- *
- * (c) 2017, Baptiste Donaux
- */
-"use strict";
-var ConditionOperator;
-(function (ConditionOperator) {
-    ConditionOperator[ConditionOperator["AND"] = 0] = "AND";
-    ConditionOperator[ConditionOperator["OR"] = 1] = "OR";
-})(ConditionOperator || (ConditionOperator = {}));
-var EventType;
-(function (EventType) {
-    EventType[EventType["KEYDOWN"] = 0] = "KEYDOWN";
-    EventType[EventType["KEYUP"] = 1] = "KEYUP";
-})(EventType || (EventType = {}));
-/**
- * Core
- *
- * @class
- * @author Baptiste Donaux <baptiste.donaux@gmail.com> @baptistedonaux
- */
-var AutoComplete = (function () {
-    // Constructor
-    function AutoComplete(params, selector) {
-        if (params === void 0) { params = {}; }
-        if (selector === void 0) { selector = "[data-autocomplete]"; }
-        if (Array.isArray(selector)) {
-            selector.forEach(function (s) {
-                new AutoComplete(params, s);
-            });
-        }
-        else if (typeof selector == "string") {
-            var elements = document.querySelectorAll(selector);
-            Array.prototype.forEach.call(elements, function (input) {
-                new AutoComplete(params, input);
-            });
-        }
-        else {
-            var specificParams = AutoComplete.merge(AutoComplete.defaults, params, {
-                DOMResults: document.createElement("div")
-            });
-            AutoComplete.prototype.create(specificParams, selector);
-            return specificParams;
-        }
-    }
-    AutoComplete.prototype.create = function (params, element) {
-        params.Input = element;
-        if (params.Input.nodeName.match(/^INPUT$/i) && (params.Input.hasAttribute("type") === false || params.Input.getAttribute("type").match(/^TEXT|SEARCH$/i))) {
-            params.Input.setAttribute("autocomplete", "off");
-            params._Position(params);
-            params.Input.parentNode.appendChild(params.DOMResults);
-            params.$Listeners = {
-                blur: params._Blur.bind(params),
-                destroy: AutoComplete.prototype.destroy.bind(null, params),
-                focus: params._Focus.bind(params),
-                keyup: AutoComplete.prototype.event.bind(null, params, EventType.KEYUP),
-                keydown: AutoComplete.prototype.event.bind(null, params, EventType.KEYDOWN),
-                position: params._Position.bind(params)
-            };
-            for (var event in params.$Listeners) {
-                params.Input.addEventListener(event, params.$Listeners[event]);
-            }
-        }
-    };
-    AutoComplete.prototype.getEventsByType = function (params, type) {
-        var mappings = {};
-        for (var key in params.KeyboardMappings) {
-            var event = EventType.KEYUP;
-            if (params.KeyboardMappings[key].Event !== undefined) {
-                event = params.KeyboardMappings[key].Event;
-            }
-            if (event == type) {
-                mappings[key] = params.KeyboardMappings[key];
-            }
-        }
-        return mappings;
-    };
-    AutoComplete.prototype.event = function (params, type, event) {
-        var eventIdentifier = function (condition) {
-            if ((match === true && mapping.Operator == ConditionOperator.AND) || (match === false && mapping.Operator == ConditionOperator.OR)) {
-                condition = AutoComplete.merge({
-                    Not: false
-                }, condition);
-                if (condition.hasOwnProperty("Is")) {
-                    if (condition.Is == event.keyCode) {
-                        match = !condition.Not;
-                    }
-                    else {
-                        match = condition.Not;
-                    }
-                }
-                else if (condition.hasOwnProperty("From") && condition.hasOwnProperty("To")) {
-                    if (event.keyCode >= condition.From && event.keyCode <= condition.To) {
-                        match = !condition.Not;
-                    }
-                    else {
-                        match = condition.Not;
-                    }
-                }
-            }
-        };
-        for (var name in AutoComplete.prototype.getEventsByType(params, type)) {
-            var mapping = AutoComplete.merge({
-                Operator: ConditionOperator.AND
-            }, params.KeyboardMappings[name]), match = ConditionOperator.AND == mapping.Operator;
-            mapping.Conditions.forEach(eventIdentifier);
-            if (match === true) {
-                mapping.Callback.call(params, event);
-            }
-        }
-    };
-    AutoComplete.prototype.makeRequest = function (params, callback) {
-        var propertyHttpHeaders = Object.getOwnPropertyNames(params.HttpHeaders), request = new XMLHttpRequest(), method = params._HttpMethod(), url = params._Url(), queryParams = params._Pre(), queryParamsStringify = encodeURIComponent(params._QueryArg()) + "=" + encodeURIComponent(queryParams);
-        if (method.match(/^GET$/i)) {
-            if (url.indexOf("?") !== -1) {
-                url += "&" + queryParamsStringify;
-            }
-            else {
-                url += "?" + queryParamsStringify;
-            }
-        }
-        request.open(method, url, true);
-        for (var i = propertyHttpHeaders.length - 1; i >= 0; i--) {
-            request.setRequestHeader(propertyHttpHeaders[i], params.HttpHeaders[propertyHttpHeaders[i]]);
-        }
-        request.onreadystatechange = function () {
-            if (request.readyState == 4 && request.status == 200) {
-                params.$Cache[queryParams] = request.response;
-                callback(request.response);
-            }
-        };
-        return request;
-    };
-    AutoComplete.prototype.ajax = function (params, request, timeout) {
-        if (timeout === void 0) { timeout = true; }
-        if (params.$AjaxTimer) {
-            window.clearTimeout(params.$AjaxTimer);
-        }
-        if (timeout === true) {
-            params.$AjaxTimer = window.setTimeout(AutoComplete.prototype.ajax.bind(null, params, request, false), params.Delay);
-        }
-        else {
-            if (params.Request) {
-                params.Request.abort();
-            }
-            params.Request = request;
-            params.Request.send(params._QueryArg() + "=" + params._Pre());
-        }
-    };
-    AutoComplete.prototype.cache = function (params, callback) {
-        var response = params._Cache(params._Pre());
-        if (response === undefined) {
-            var request = AutoComplete.prototype.makeRequest(params, callback);
-            AutoComplete.prototype.ajax(params, request);
-        }
-        else {
-            callback(response);
-        }
-    };
-    AutoComplete.prototype.destroy = function (params) {
-        for (var event in params.$Listeners) {
-            params.Input.removeEventListener(event, params.$Listeners[event]);
-        }
-        params.DOMResults.parentNode.removeChild(params.DOMResults);
-    };
-    return AutoComplete;
-}());
-AutoComplete.merge = function () {
-    var merge = {}, tmp;
-    for (var i = 0; i < arguments.length; i++) {
-        for (tmp in arguments[i]) {
-            merge[tmp] = arguments[i][tmp];
-        }
-    }
-    return merge;
-};
-AutoComplete.defaults = {
-    Delay: 150,
-    EmptyMessage: "No result here",
-    Highlight: {
-        getRegex: function (value) {
-            return new RegExp(value, "ig");
-        },
-        transform: function (value) {
-            return "<strong>" + value + "</strong>";
-        }
-    },
-    HttpHeaders: {
-        "Content-type": "application/x-www-form-urlencoded"
-    },
-    Limit: 0,
-    MinChars: 0,
-    HttpMethod: "GET",
-    QueryArg: "q",
-    Url: null,
-    KeyboardMappings: {
-        "Enter": {
-            Conditions: [{
-                    Is: 13,
-                    Not: false
-                }],
-            Callback: function (event) {
-                if (this.DOMResults.getAttribute("class").indexOf("open") != -1) {
-                    var liActive = this.DOMResults.querySelector("li.active");
-                    if (liActive !== null) {
-                        event.preventDefault();
-                        this._Select(liActive);
-                        this.DOMResults.setAttribute("class", "autocomplete");
-                    }
-                }
-            },
-            Operator: ConditionOperator.AND,
-            Event: EventType.KEYDOWN
-        },
-        "KeyUpAndDown_down": {
-            Conditions: [{
-                    Is: 38,
-                    Not: false
-                },
-                {
-                    Is: 40,
-                    Not: false
-                }],
-            Callback: function (event) {
-                event.preventDefault();
-            },
-            Operator: ConditionOperator.OR,
-            Event: EventType.KEYDOWN
-        },
-        "KeyUpAndDown_up": {
-            Conditions: [{
-                    Is: 38,
-                    Not: false
-                },
-                {
-                    Is: 40,
-                    Not: false
-                }],
-            Callback: function (event) {
-                event.preventDefault();
-                var first = this.DOMResults.querySelector("li:first-child:not(.locked)"), last = this.DOMResults.querySelector("li:last-child:not(.locked)"), active = this.DOMResults.querySelector("li.active");
-                if (active) {
-                    var currentIndex = Array.prototype.indexOf.call(active.parentNode.children, active), position = currentIndex + (event.keyCode - 39), lisCount = this.DOMResults.getElementsByTagName("li").length;
-                    if (position < 0) {
-                        position = lisCount - 1;
-                    }
-                    else if (position >= lisCount) {
-                        position = 0;
-                    }
-                    active.classList.remove("active");
-                    active.parentElement.children.item(position).classList.add("active");
-                }
-                else if (last && event.keyCode == 38) {
-                    last.classList.add("active");
-                }
-                else if (first) {
-                    first.classList.add("active");
-                }
-            },
-            Operator: ConditionOperator.OR,
-            Event: EventType.KEYUP
-        },
-        "AlphaNum": {
-            Conditions: [{
-                    Is: 13,
-                    Not: true
-                }, {
-                    From: 35,
-                    To: 40,
-                    Not: true
-                }],
-            Callback: function () {
-                var oldValue = this.Input.getAttribute("data-autocomplete-old-value"), currentValue = this._Pre();
-                if (currentValue !== "" && currentValue.length >= this._MinChars()) {
-                    if (!oldValue || currentValue != oldValue) {
-                        this.DOMResults.setAttribute("class", "autocomplete open");
-                    }
-                    AutoComplete.prototype.cache(this, function (response) {
-                        this._Render(this._Post(response));
-                        this._Open();
-                    }.bind(this));
-                }
-            },
-            Operator: ConditionOperator.AND,
-            Event: EventType.KEYUP
-        }
-    },
-    DOMResults: null,
-    Request: null,
-    Input: null,
-    /**
-     * Return the message when no result returns
-     */
-    _EmptyMessage: function () {
-        var emptyMessage = "";
-        if (this.Input.hasAttribute("data-autocomplete-empty-message")) {
-            emptyMessage = this.Input.getAttribute("data-autocomplete-empty-message");
-        }
-        else if (this.EmptyMessage !== false) {
-            emptyMessage = this.EmptyMessage;
-        }
-        else {
-            emptyMessage = "";
-        }
-        return emptyMessage;
-    },
-    /**
-     * Returns the maximum number of results
-     */
-    _Limit: function () {
-        var limit = this.Input.getAttribute("data-autocomplete-limit");
-        if (isNaN(limit) || limit === null) {
-            return this.Limit;
-        }
-        return parseInt(limit, 10);
-    },
-    /**
-     * Returns the minimum number of characters entered before firing ajax
-     */
-    _MinChars: function () {
-        var minchars = this.Input.getAttribute("data-autocomplete-minchars");
-        if (isNaN(minchars) || minchars === null) {
-            return this.MinChars;
-        }
-        return parseInt(minchars, 10);
-    },
-    /**
-     * Apply transformation on labels response
-     */
-    _Highlight: function (label) {
-        return label.replace(this.Highlight.getRegex(this._Pre()), this.Highlight.transform);
-    },
-    /**
-     * Returns the HHTP method to use
-     */
-    _HttpMethod: function () {
-        if (this.Input.hasAttribute("data-autocomplete-method")) {
-            return this.Input.getAttribute("data-autocomplete-method");
-        }
-        return this.HttpMethod;
-    },
-    /**
-     * Returns the query param to use
-     */
-    _QueryArg: function () {
-        if (this.Input.hasAttribute("data-autocomplete-param-name")) {
-            return this.Input.getAttribute("data-autocomplete-param-name");
-        }
-        return this.QueryArg;
-    },
-    /**
-     * Returns the URL to use for AJAX request
-     */
-    _Url: function () {
-        if (this.Input.hasAttribute("data-autocomplete")) {
-            return this.Input.getAttribute("data-autocomplete");
-        }
-        return this.Url;
-    },
-    /**
-     * Manage the close
-     */
-    _Blur: function (now) {
-        if (now === true) {
-            this.DOMResults.setAttribute("class", "autocomplete");
-            this.Input.setAttribute("data-autocomplete-old-value", this.Input.value);
-        }
-        else {
-            var params = this;
-            setTimeout(function () {
-                params._Blur(true);
-            }, 150);
-        }
-    },
-    /**
-     * Manage the cache
-     */
-    _Cache: function (value) {
-        return this.$Cache[value];
-    },
-    /**
-     * Manage the open
-     */
-    _Focus: function () {
-        var oldValue = this.Input.getAttribute("data-autocomplete-old-value");
-        if ((!oldValue || this.Input.value != oldValue) && this._MinChars() <= this.Input.value.length) {
-            this.DOMResults.setAttribute("class", "autocomplete open");
-        }
-    },
-    /**
-     * Bind all results item if one result is opened
-     */
-    _Open: function () {
-        var params = this;
-        Array.prototype.forEach.call(this.DOMResults.getElementsByTagName("li"), function (li) {
-            if (li.getAttribute("class") != "locked") {
-		            li.onclick = function (event) {
-                    params._Select(li);
-                };
-                li.onmouseenter = function () {
-                    var active = params.DOMResults.querySelector("li.active");
-                    if (active !== li) {
-                        if (active !== null) {
-                            active.classList.remove("active");
-                        }
-                        li.classList.add("active");
-                    }
-                };
-            }
-        });
-    },
-    /**
-     * Position the results HTML element
-     */
-    _Position: function () {
-        this.DOMResults.setAttribute("class", "autocomplete");
-        this.DOMResults.setAttribute("style", "top:" + (this.Input.offsetTop + this.Input.offsetHeight) + "px;left:" + this.Input.offsetLeft + "px;width:" + this.Input.clientWidth + "px;");
-    },
-    /**
-     * Execute the render of results DOM element
-     */
-    _Render: function (response) {
-        var ul;
-        if (typeof response == "string") {
-            ul = this._RenderRaw(response);
-        }
-        else {
-            ul = this._RenderResponseItems(response);
-        }
-        if (this.DOMResults.hasChildNodes()) {
-            this.DOMResults.removeChild(this.DOMResults.childNodes[0]);
-        }
-        this.DOMResults.appendChild(ul);
-    },
-    /**
-     * ResponseItems[] rendering
-     */
-    _RenderResponseItems: function (response) {
-        var ul = document.createElement("ul"), li = document.createElement("li"), limit = this._Limit();
-        // Order
-        if (limit < 0) {
-            response = response.reverse();
-        }
-        else if (limit === 0) {
-            limit = response.length;
-        }
-        for (var item = 0; item < Math.min(Math.abs(limit), response.length); item++) {
-            li.innerHTML = response[item].Label;
-            li.setAttribute("data-autocomplete-value", response[item].Value);
-            ul.appendChild(li);
-            li = document.createElement("li");
-        }
-        return ul;
-    },
-    /**
-     * string response rendering (RAW HTML)
-     */
-    _RenderRaw: function (response) {
-        var ul = document.createElement("ul"), li = document.createElement("li");
-        if (response.length > 0) {
-            this.DOMResults.innerHTML = response;
-        }
-        else {
-            var emptyMessage = this._EmptyMessage();
-            if (emptyMessage !== "") {
-                li.innerHTML = emptyMessage;
-                li.setAttribute("class", "locked");
-                ul.appendChild(li);
-            }
-        }
-        return ul;
-    },
-    /**
-     * Deal with request response
-     */
-    _Post: function (response) {
-        try {
-            var returnResponse = [];
-            //JSON return
-            var json = JSON.parse(response);
-            if (Object.keys(json).length === 0) {
-                return "";
-            }
-            if (Array.isArray(json)) {
-                for (var i = 0; i < Object.keys(json).length; i++) {
-                    returnResponse[returnResponse.length] = { "Value": json[i], "Label": this._Highlight(json[i]) };
-                }
-            }
-            else {
-                for (var value in json) {
-                    returnResponse.push({
-                        "Value": value,
-                        "Label": this._Highlight(json[value])
-                    });
-                }
-            }
-            return returnResponse;
-        }
-        catch (event) {
-            //HTML return
-            return response;
-        }
-    },
-    /**
-     * Return the autocomplete value to send (before request)
-     */
-    _Pre: function () {
-        return this.Input.value;
-    },
-    /**
-     * Choice one result item
-     */
-    _Select: function (item) {
-	console.log('test test test');
-        if (item.hasAttribute("data-autocomplete-value")) {
-            this.Input.value = item.getAttribute("data-autocomplete-value");
-        }
-        else {
-            this.Input.value = item.innerHTML;
-        }
-        this.Input.setAttribute("data-autocomplete-old-value", this.Input.value);
-    },
-    $AjaxTimer: null,
-    $Cache: {},
-    $Listeners: {}
-};
-module.exports = AutoComplete;
-
-},{}]},{},[1])(1)
-});

searx/static/themes/simple/package.json

@@ -2,6 +2,7 @@
   "devDependencies": {
     "grunt-cli": "^1.4.3",
     "grunt": "~1.4.1",
+    "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-concat": "~1.0.1",
     "grunt-contrib-cssmin": "^4.0.0",
     "grunt-contrib-jshint": "~3.0.0",
@@ -14,10 +15,13 @@
     "less": "^4.1.1",
     "less-plugin-clean-css": "^1.5.1"
   },
+  "dependencies": {
+    "autocomplete-js": "2.7.1",
+    "leaflet": "^1.7.1"
+  },
   "scripts": {
     "build": "npm install && grunt",
     "start": "grunt watch",
     "test": "grunt"
-  },
-  "dependencies": {}
+  }
 }