fomantic-ui 2.10.0-beta.6 → 2.10.0-beta.8

package/dist/components/search.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.10.0-beta.6+42a411a - Search
+ * # Fomantic-UI 2.10.0-beta.8+62e258f - Search
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -20,49 +20,45 @@
         : globalThis;
 
     $.fn.search = function (parameters) {
-        var
-            $allModules     = $(this),
+        let $allModules = $(this);
 
-            time            = Date.now(),
-            performance     = [],
+        let time = Date.now();
+        let performance = [];
 
-            query           = arguments[0],
-            methodInvoked   = typeof query === 'string',
-            queryArguments  = [].slice.call(arguments, 1),
-            returnedValue
-        ;
+        let query = arguments[0];
+        let methodInvoked = typeof query === 'string';
+        let queryArguments = [].slice.call(arguments, 1);
+        let returnedValue;
         $allModules.each(function () {
-            var
-                settings          = $.isPlainObject(parameters)
-                    ? $.extend(true, {}, $.fn.search.settings, parameters)
-                    : $.extend({}, $.fn.search.settings),
-
-                className        = settings.className,
-                metadata         = settings.metadata,
-                regExp           = settings.regExp,
-                fields           = settings.fields,
-                selector         = settings.selector,
-                error            = settings.error,
-                namespace        = settings.namespace,
-
-                eventNamespace   = '.' + namespace,
-                moduleNamespace  = namespace + '-module',
-
-                $module          = $(this),
-                $prompt          = $module.find(selector.prompt),
-                $searchButton    = $module.find(selector.searchButton),
-                $results         = $module.find(selector.results),
-                $result          = $module.find(selector.result),
-                $category        = $module.find(selector.category),
-
-                element          = this,
-                instance         = $module.data(moduleNamespace),
-
-                disabledBubbled  = false,
-                resultsDismissed = false,
-
-                module
-            ;
+            let settings = $.isPlainObject(parameters)
+                ? $.extend(true, {}, $.fn.search.settings, parameters)
+                : $.extend({}, $.fn.search.settings);
+
+            let className = settings.className;
+            let metadata = settings.metadata;
+            let regExp = settings.regExp;
+            let fields = settings.fields;
+            let selector = settings.selector;
+            let error = settings.error;
+            let namespace = settings.namespace;
+
+            let eventNamespace = '.' + namespace;
+            let moduleNamespace = namespace + '-module';
+
+            let $module = $(this);
+            let $prompt = $module.find(selector.prompt);
+            let $searchButton = $module.find(selector.searchButton);
+            let $results = $module.find(selector.results);
+            let $result = $module.find(selector.result);
+            let $category = $module.find(selector.category);
+
+            let element = this;
+            let instance = $module.data(moduleNamespace);
+
+            let disabledBubbled = false;
+            let resultsDismissed = false;
+
+            let module;
 
             module = {
 
@@ -79,15 +75,13 @@
                     module.verbose('Storing instance of module', module);
                     instance = module;
                     $module
-                        .data(moduleNamespace, module)
-                    ;
+                        .data(moduleNamespace, module);
                 },
                 destroy: function () {
                     module.verbose('Destroying instance');
                     $module
                         .off(eventNamespace)
-                        .removeData(moduleNamespace)
-                    ;
+                        .removeData(moduleNamespace);
                 },
 
                 refresh: function () {
@@ -109,11 +103,9 @@
                         module.verbose('Binding events to search');
                         if (settings.automatic) {
                             $module
-                                .on(module.get.inputEvent() + eventNamespace, selector.prompt, module.event.input)
-                            ;
+                                .on(module.get.inputEvent() + eventNamespace, selector.prompt, module.event.input);
                             $prompt
-                                .attr('autocomplete', module.is.chrome() ? 'fomantic-search' : 'off')
-                            ;
+                                .attr('autocomplete', module.is.chrome() ? 'fomantic-search' : 'off');
                         }
                         $module
                             // prompt
@@ -126,8 +118,7 @@
                             .on('mousedown' + eventNamespace, selector.results, module.event.result.mousedown)
                             .on('mouseup' + eventNamespace, selector.results, module.event.result.mouseup)
                             .on('click' + eventNamespace, selector.result, module.event.result.click)
-                            .on('click' + eventNamespace, selector.remove, module.event.remove.click)
-                        ;
+                            .on('click' + eventNamespace, selector.remove, module.event.remove.click);
                     },
                 },
 
@@ -138,8 +129,7 @@
                         if (parameters && parameters.searchFields !== undefined) {
                             settings.searchFields = Array.isArray(parameters.searchFields)
                                 ? parameters.searchFields
-                                : [parameters.searchFields]
-                            ;
+                                : [parameters.searchFields];
                         }
                     },
                 },
@@ -168,16 +158,14 @@
                         }
                     },
                     blur: function (event) {
-                        var
-                            pageLostFocus = document.activeElement === this,
-                            callback      = function () {
-                                module.cancel.query();
-                                module.remove.focus();
-                                module.timer = setTimeout(function () {
-                                    module.hideResults();
-                                }, settings.hideDelay);
-                            }
-                        ;
+                        let pageLostFocus = document.activeElement === this;
+                        let callback = function () {
+                            module.cancel.query();
+                            module.remove.focus();
+                            module.timer = setTimeout(function () {
+                                module.hideResults();
+                            }, settings.hideDelay);
+                        };
                         if (pageLostFocus) {
                             return;
                         }
@@ -195,8 +183,7 @@
                                     if (!module.is.animating() && !module.is.hidden()) {
                                         callback();
                                     }
-                                })
-                            ;
+                                });
                         } else {
                             module.debug('Input blurred without user action, closing results');
                             callback();
@@ -217,22 +204,20 @@
                         },
                         click: function (event) {
                             module.debug('Search result selected');
-                            var
-                                $result = $(this),
-                                $title  = $result.find(selector.title).eq(0),
-                                $link   = $result.is('a[href]')
-                                    ? $result
-                                    : $result.find('a[href]').eq(0),
-                                href    = $link.attr('href') || false,
-                                target  = $link.attr('target') || false,
-                                // title is used for result lookup
-                                value   = $title.length > 0
-                                    ? $title.text()
-                                    : false,
-                                results = module.get.results(),
-                                result  = $result.data(metadata.result) || module.get.result(value, results)
-                            ;
-                            var oldValue = module.get.value();
+                            let $result = $(this);
+                            let $title = $result.find(selector.title).eq(0);
+                            let $link = $result.is('a[href]')
+                                ? $result
+                                : $result.find('a[href]').eq(0);
+                            let href = $link.attr('href') || false;
+                            let target = $link.attr('target') || false;
+                            // title is used for result lookup
+                            let value = $title.length > 0
+                                ? $title.text()
+                                : false;
+                            let results = module.get.results();
+                            let result = $result.data(metadata.result) || module.get.result(value, results);
+                            let oldValue = module.get.value();
                             if (isFunction(settings.onSelect)) {
                                 if (settings.onSelect.call(element, result, results) === false) {
                                     module.debug('Custom onSelect callback cancelled default select action');
@@ -258,12 +243,10 @@
                     },
                 },
                 ensureVisible: function ($el) {
-                    var
-                        elTop,
-                        elBottom,
-                        resultsScrollTop,
-                        resultsHeight
-                    ;
+                    let elTop;
+                    let elBottom;
+                    let resultsScrollTop;
+                    let resultsHeight;
                     if ($el.length === 0) {
                         return;
                     }
@@ -280,25 +263,23 @@
                     }
                 },
                 handleKeyboard: function (event) {
-                    var
-                        // force selector refresh
-                        $result         = $module.find(selector.result),
-                        $category       = $module.find(selector.category),
-                        $activeResult   = $result.filter('.' + className.active),
-                        currentIndex    = $result.index($activeResult),
-                        resultSize      = $result.length,
-                        hasActiveResult = $activeResult.length > 0,
-
-                        keyCode         = event.which,
-                        keys            = {
-                            backspace: 8,
-                            enter: 13,
-                            escape: 27,
-                            upArrow: 38,
-                            downArrow: 40,
-                        },
-                        newIndex
-                    ;
+                    // force selector refresh
+                    let $result = $module.find(selector.result);
+                    let $category = $module.find(selector.category);
+                    let $activeResult = $result.filter('.' + className.active);
+                    let currentIndex = $result.index($activeResult);
+                    let resultSize = $result.length;
+                    let hasActiveResult = $activeResult.length > 0;
+
+                    let keyCode = event.which;
+                    let keys = {
+                        backspace: 8,
+                        enter: 13,
+                        escape: 27,
+                        upArrow: 38,
+                        downArrow: 40,
+                    };
+                    let newIndex;
                     // search shortcuts
                     if (keyCode === keys.escape) {
                         if (!module.is.visible()) {
@@ -325,15 +306,13 @@
                                 ? currentIndex
                                 : currentIndex - 1;
                             $category
-                                .removeClass(className.active)
-                            ;
+                                .removeClass(className.active);
                             $result
                                 .removeClass(className.active)
                                 .eq(newIndex)
                                 .addClass(className.active)
                                 .closest($category)
-                                .addClass(className.active)
-                            ;
+                                .addClass(className.active);
                             module.ensureVisible($result.eq(newIndex));
                             event.preventDefault();
                         } else if (keyCode === keys.downArrow) {
@@ -342,15 +321,13 @@
                                 ? currentIndex
                                 : currentIndex + 1;
                             $category
-                                .removeClass(className.active)
-                            ;
+                                .removeClass(className.active);
                             $result
                                 .removeClass(className.active)
                                 .eq(newIndex)
                                 .addClass(className.active)
                                 .closest($category)
-                                .addClass(className.active)
-                            ;
+                                .addClass(className.active);
                             module.ensureVisible($result.eq(newIndex));
                             event.preventDefault();
                         }
@@ -367,44 +344,42 @@
 
                 setup: {
                     api: function (searchTerm, callback) {
-                        var
-                            apiSettings = {
-                                debug: settings.debug,
-                                on: false,
-                                cache: settings.cache,
-                                action: 'search',
-                                urlData: {
-                                    query: searchTerm,
-                                },
+                        let apiSettings = {
+                            debug: settings.debug,
+                            on: false,
+                            cache: settings.cache,
+                            action: 'search',
+                            urlData: {
+                                query: searchTerm,
                             },
-                            apiCallbacks = {
-                                onSuccess: function (response, $module, xhr) {
-                                    module.parse.response.call(element, response, searchTerm);
-                                    callback();
-                                    if (settings.apiSettings && typeof settings.apiSettings.onSuccess === 'function') {
-                                        settings.apiSettings.onSuccess.call(this, response, $module, xhr);
-                                    }
-                                },
-                                onFailure: function (response, $module, xhr) {
-                                    module.displayMessage(error.serverError);
-                                    callback();
-                                    if (settings.apiSettings && typeof settings.apiSettings.onFailure === 'function') {
-                                        settings.apiSettings.onFailure.call(this, response, $module, xhr);
-                                    }
-                                },
-                                onAbort: function (status, $module, xhr) {
-                                    if (settings.apiSettings && typeof settings.apiSettings.onAbort === 'function') {
-                                        settings.apiSettings.onAbort.call(this, status, $module, xhr);
-                                    }
-                                },
-                                onError: function (errorMessage, $module, xhr) {
-                                    module.error();
-                                    if (settings.apiSettings && typeof settings.apiSettings.onError === 'function') {
-                                        settings.apiSettings.onError.call(this, errorMessage, $module, xhr);
-                                    }
-                                },
-                            }
-                        ;
+                        };
+                        let apiCallbacks = {
+                            onSuccess: function (response, $module, xhr) {
+                                module.parse.response.call(element, response, searchTerm);
+                                callback();
+                                if (settings.apiSettings && typeof settings.apiSettings.onSuccess === 'function') {
+                                    settings.apiSettings.onSuccess.call(this, response, $module, xhr);
+                                }
+                            },
+                            onFailure: function (response, $module, xhr) {
+                                module.displayMessage(error.serverError);
+                                callback();
+                                if (settings.apiSettings && typeof settings.apiSettings.onFailure === 'function') {
+                                    settings.apiSettings.onFailure.call(this, response, $module, xhr);
+                                }
+                            },
+                            onAbort: function (status, $module, xhr) {
+                                if (settings.apiSettings && typeof settings.apiSettings.onAbort === 'function') {
+                                    settings.apiSettings.onAbort.call(this, status, $module, xhr);
+                                }
+                            },
+                            onError: function (errorMessage, $module, xhr) {
+                                module.error();
+                                if (settings.apiSettings && typeof settings.apiSettings.onError === 'function') {
+                                    settings.apiSettings.onError.call(this, errorMessage, $module, xhr);
+                                }
+                            },
+                        };
                         $.extend(true, apiSettings, settings.apiSettings, apiCallbacks);
                         module.verbose('Setting up API request', apiSettings);
                         $module.api(apiSettings);
@@ -437,10 +412,8 @@
                         if (!event.target) {
                             return;
                         }
-                        var
-                            $target = $(event.target),
-                            isInDOM = $.contains(document.documentElement, event.target)
-                        ;
+                        let $target = $(event.target);
+                        let isInDOM = $.contains(document.documentElement, event.target);
 
                         return isInDOM && $target.closest(selector.message).length > 0;
                     },
@@ -463,14 +436,12 @@
                         }
                     },
                     inputEvent: function () {
-                        var
-                            prompt = $prompt[0],
-                            inputEvent   = prompt !== undefined && prompt.oninput !== undefined
-                                ? 'input'
-                                : (prompt !== undefined && prompt.onpropertychange !== undefined
-                                    ? 'propertychange'
-                                    : 'keyup')
-                        ;
+                        let prompt = $prompt[0];
+                        let inputEvent = prompt !== undefined && prompt.oninput !== undefined
+                            ? 'input'
+                            : (prompt !== undefined && prompt.onpropertychange !== undefined
+                                ? 'propertychange'
+                                : 'keyup');
 
                         return inputEvent;
                     },
@@ -481,9 +452,7 @@
                         return $module.data(metadata.results);
                     },
                     result: function (value, results) {
-                        var
-                            result       = false
-                        ;
+                        let result = false;
                         value = value !== undefined
                             ? value
                             : module.get.value();
@@ -527,8 +496,7 @@
                     value: function (value) {
                         module.verbose('Setting search input value', value);
                         $prompt
-                            .val(value)
-                        ;
+                            .val(value);
                     },
                     type: function (type) {
                         type = type || settings.type;
@@ -560,10 +528,8 @@
                     callback = isFunction(callback)
                         ? callback
                         : function () {};
-                    var
-                        searchTerm = module.get.value(),
-                        cache = module.read.cache(searchTerm)
-                    ;
+                    let searchTerm = module.get.value();
+                    let cache = module.read.cache(searchTerm);
                     callback = callback || function () {};
                     if (module.has.minimumCharacters()) {
                         if (cache) {
@@ -593,10 +559,8 @@
 
                 search: {
                     local: function (searchTerm) {
-                        var
-                            results = module.search.object(searchTerm, settings.source),
-                            searchHTML
-                        ;
+                        let results = module.search.object(searchTerm, settings.source);
+                        let searchHTML;
                         module.set.loading();
                         module.save.results(results);
                         module.debug('Returned full local search results', results);
@@ -627,30 +591,25 @@
                         }
                         module.setup.api(searchTerm, callback);
                         $module
-                            .api('query')
-                        ;
+                            .api('query');
                     },
                     object: function (searchTerm, source, searchFields) {
                         searchTerm = module.remove.diacritics(String(searchTerm));
-                        var
-                            results      = [],
-                            exactResults = [],
-                            fuzzyResults = [],
-                            searchExp    = searchTerm.replace(regExp.escape, '\\$&'),
-                            matchRegExp = new RegExp(regExp.beginsWith + searchExp, settings.ignoreSearchCase ? 'i' : ''),
-
-                            // avoid duplicates when pushing results
-                            addResult = function (array, result) {
-                                var
-                                    notResult      = $.inArray(result, results) === -1,
-                                    notFuzzyResult = $.inArray(result, fuzzyResults) === -1,
-                                    notExactResults = $.inArray(result, exactResults) === -1
-                                ;
-                                if (notResult && notFuzzyResult && notExactResults) {
-                                    array.push(result);
-                                }
+                        let results = [];
+                        let exactResults = [];
+                        let fuzzyResults = [];
+                        let searchExp = searchTerm.replace(regExp.escape, '\\$&');
+                        let matchRegExp = new RegExp(regExp.beginsWith + searchExp, settings.ignoreSearchCase ? 'i' : '');
+
+                        // avoid duplicates when pushing results
+                        let addResult = function (array, result) {
+                            let notResult = $.inArray(result, results) === -1;
+                            let notFuzzyResult = $.inArray(result, fuzzyResults) === -1;
+                            let notExactResults = $.inArray(result, exactResults) === -1;
+                            if (notResult && notFuzzyResult && notExactResults) {
+                                array.push(result);
                             }
-                        ;
+                        };
                         source = source || settings.source;
                         searchFields = searchFields !== undefined
                             ? searchFields
@@ -668,15 +627,13 @@
                             return [];
                         }
                         // iterate through search fields looking for matches
-                        var lastSearchFieldIndex = searchFields.length - 1;
+                        let lastSearchFieldIndex = searchFields.length - 1;
                         $.each(source, function (label, content) {
-                            var concatenatedContent = [];
+                            let concatenatedContent = [];
                             $.each(searchFields, function (index, field) {
-                                var
-                                    fieldExists = typeof content[field] === 'string' || typeof content[field] === 'number'
-                                ;
+                                let fieldExists = typeof content[field] === 'string' || typeof content[field] === 'number';
                                 if (fieldExists) {
-                                    var text;
+                                    let text;
                                     text = typeof content[field] === 'string'
                                         ? module.remove.diacritics(content[field])
                                         : content[field].toString();
@@ -719,11 +676,10 @@
                     return term.indexOf(query) > -1;
                 },
                 wordSearch: function (query, term, matchAll) {
-                    var allWords = query.split(/\s+/),
-                        w,
-                        wL = allWords.length,
-                        found = false
-                    ;
+                    let allWords = query.split(/\s+/);
+                    let w;
+                    let wL = allWords.length;
+                    let found = false;
                     for (w = 0; w < wL; w++) {
                         found = module.exactSearch(allWords[w], term);
                         if ((!found && matchAll) || (found && !matchAll)) {
@@ -734,10 +690,8 @@
                     return found;
                 },
                 fuzzySearch: function (query, term) {
-                    var
-                        termLength  = term.length,
-                        queryLength = query.length
-                    ;
+                    let termLength = term.length;
+                    let queryLength = query.length;
                     if (typeof query !== 'string') {
                         return false;
                     }
@@ -751,11 +705,9 @@
                     if (queryLength === termLength) {
                         return query === term;
                     }
-                    for (var characterIndex = 0, nextCharacterIndex = 0; characterIndex < queryLength; characterIndex++) {
-                        var
-                            continueSearch = false,
-                            queryCharacter = query.charCodeAt(characterIndex)
-                        ;
+                    for (let characterIndex = 0, nextCharacterIndex = 0; characterIndex < queryLength; characterIndex++) {
+                        let continueSearch = false;
+                        let queryCharacter = query.charCodeAt(characterIndex);
                         while (nextCharacterIndex < termLength) {
                             if (term.charCodeAt(nextCharacterIndex++) === queryCharacter) {
                                 continueSearch = true;
@@ -775,13 +727,11 @@
                 parse: {
                     response: function (response, searchTerm) {
                         if (Array.isArray(response)) {
-                            var o = {};
+                            let o = {};
                             o[fields.results] = response;
                             response = o;
                         }
-                        var
-                            searchHTML = module.generateResults(response)
-                        ;
+                        let searchHTML = module.generateResults(response);
                         module.verbose('Parsing server response', response);
                         if (response !== undefined) {
                             if (searchTerm !== undefined && response[fields.results] !== undefined) {
@@ -807,10 +757,8 @@
 
                 has: {
                     minimumCharacters: function () {
-                        var
-                            searchTerm    = module.get.value(),
-                            numCharacters = searchTerm.length
-                        ;
+                        let searchTerm = module.get.value();
+                        let numCharacters = searchTerm.length;
 
                         return numCharacters >= settings.minCharacters;
                     },
@@ -818,9 +766,7 @@
                         if ($results.length === 0) {
                             return false;
                         }
-                        var
-                            html = $results.html()
-                        ;
+                        let html = $results.html();
 
                         return html !== '';
                     },
@@ -828,9 +774,7 @@
 
                 clear: {
                     cache: function (value) {
-                        var
-                            cache = $module.data(metadata.cache)
-                        ;
+                        let cache = $module.data(metadata.cache);
                         if (!value) {
                             module.debug('Clearing cache', value);
                             $module.removeData(metadata.cache);
@@ -847,9 +791,7 @@
 
                 read: {
                     cache: function (name) {
-                        var
-                            cache = $module.data(metadata.cache)
-                        ;
+                        let cache = $module.data(metadata.cache);
                         if (settings.cache) {
                             module.verbose('Checking cache for generated html for query', name);
 
@@ -864,9 +806,7 @@
 
                 create: {
                     categoryResults: function (results) {
-                        var
-                            categoryResults = {}
-                        ;
+                        let categoryResults = {};
                         $.each(results, function (index, result) {
                             if (!result.category) {
                                 return;
@@ -885,11 +825,9 @@
                         return categoryResults;
                     },
                     id: function (resultIndex, categoryIndex) {
-                        var
-                            resultID      = resultIndex + 1, // not zero indexed
-                            letterID,
-                            id
-                        ;
+                        let resultID = resultIndex + 1; // not zero indexed
+                        let letterID;
+                        let id;
                         if (categoryIndex !== undefined) {
                             // start char code for "A"
                             letterID = String.fromCharCode(97 + categoryIndex);
@@ -906,8 +844,7 @@
                         if ($results.length === 0) {
                             $results = $('<div />')
                                 .addClass(className.results)
-                                .appendTo($module)
-                            ;
+                                .appendTo($module);
                         }
                     },
                 },
@@ -915,29 +852,24 @@
                 inject: {
                     result: function (result, resultIndex, categoryIndex) {
                         module.verbose('Injecting result into results');
-                        var
-                            $selectedResult = categoryIndex !== undefined
-                                ? $results
-                                    .children().eq(categoryIndex)
-                                    .children(selector.results)
-                                    .first()
-                                    .children(selector.result)
-                                    .eq(resultIndex)
-                                : $results
-                                    .children(selector.result).eq(resultIndex)
-                        ;
+                        let $selectedResult = categoryIndex !== undefined
+                            ? $results
+                                .children().eq(categoryIndex)
+                                .children(selector.results)
+                                .first()
+                                .children(selector.result)
+                                .eq(resultIndex)
+                            : $results
+                                .children(selector.result).eq(resultIndex);
                         module.verbose('Injecting results metadata', $selectedResult);
                         $selectedResult
-                            .data(metadata.result, result)
-                        ;
+                            .data(metadata.result, result);
                     },
                     id: function (results) {
                         module.debug('Injecting unique ids into results');
-                        var
-                            // since results may be an object, we must use counters
-                            categoryIndex = 0,
-                            resultIndex   = 0
-                        ;
+                        // since results may be an object, we must use counters
+                        let categoryIndex = 0;
+                        let resultIndex = 0;
                         if (settings.type === 'category') {
                             // iterate through each category result
                             $.each(results, function (index, category) {
@@ -977,17 +909,14 @@
 
                 write: {
                     cache: function (name, value) {
-                        var
-                            cache = $module.data(metadata.cache) !== undefined
-                                ? $module.data(metadata.cache)
-                                : {}
-                        ;
+                        let cache = $module.data(metadata.cache) !== undefined
+                            ? $module.data(metadata.cache)
+                            : {};
                         if (settings.cache) {
                             module.verbose('Writing generated html to cache', name, value);
                             cache[name] = value;
                             $module
-                                .data(metadata.cache, cache)
-                            ;
+                                .data(metadata.cache, cache);
                         }
                     },
                 },
@@ -1002,8 +931,7 @@
                     }
                     if (html) {
                         $results
-                            .html(html)
-                        ;
+                            .html(html);
                         module.refreshResults();
                         if (settings.selectFirstResult) {
                             module.select.firstResult();
@@ -1034,21 +962,19 @@
                                     silent: settings.silent,
                                     duration: settings.duration,
                                     onShow: function () {
-                                        var $firstResult = $module.find(selector.result).eq(0);
+                                        let $firstResult = $module.find(selector.result).eq(0);
                                         module.ensureVisible($firstResult);
                                     },
                                     onComplete: function () {
                                         callback();
                                     },
                                     queue: true,
-                                })
-                            ;
+                                });
                         } else {
                             module.debug('Showing results with javascript');
                             $results
                                 .stop()
-                                .fadeIn(settings.duration, settings.easing)
-                            ;
+                                .fadeIn(settings.duration, settings.easing);
                         }
                         settings.onResultsOpen.call($results);
                     }
@@ -1071,14 +997,12 @@
                                         callback();
                                     },
                                     queue: true,
-                                })
-                            ;
+                                });
                         } else {
                             module.debug('Hiding results with javascript');
                             $results
                                 .stop()
-                                .fadeOut(settings.duration, settings.easing)
-                            ;
+                                .fadeOut(settings.duration, settings.easing);
                         }
                         settings.onResultsClose.call($results);
                     }
@@ -1086,12 +1010,10 @@
 
                 generateResults: function (response) {
                     module.debug('Generating html from response', response);
-                    var
-                        template       = settings.templates[settings.type],
-                        isProperObject = $.isPlainObject(response[fields.results]) && !$.isEmptyObject(response[fields.results]),
-                        isProperArray  = Array.isArray(response[fields.results]) && response[fields.results].length > 0,
-                        html           = ''
-                    ;
+                    let template = settings.templates[settings.type];
+                    let isProperObject = $.isPlainObject(response[fields.results]) && !$.isEmptyObject(response[fields.results]);
+                    let isProperArray = Array.isArray(response[fields.results]) && response[fields.results].length > 0;
+                    let html = '';
                     if (isProperObject || isProperArray) {
                         if (settings.maxResults > 0) {
                             if (isProperObject) {
@@ -1103,27 +1025,24 @@
                             }
                         }
                         if (settings.highlightMatches) {
-                            var results = response[fields.results],
-                                regExpIgnore = settings.ignoreSearchCase ? 'i' : '',
-                                querySplit = module.get.value().split(''),
-                                diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : '',
-                                htmlReg = '(?![^<]*>)',
-                                markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg + '(') + diacriticReg + ')', regExpIgnore),
-                                markedReplacer = function () {
-                                    var args = [].slice.call(arguments, 1, querySplit.length * 2).map(function (x, i) {
-                                        return i & 1 ? x : '<mark>' + x + '</mark>'; // eslint-disable-line no-bitwise
-                                    });
+                            let results = response[fields.results];
+                            let regExpIgnore = settings.ignoreSearchCase ? 'i' : '';
+                            let querySplit = module.get.value().split('');
+                            let diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : '';
+                            let htmlReg = '(?![^<]*>)';
+                            let markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg + '(') + diacriticReg + ')', regExpIgnore);
+                            let markedReplacer = function () {
+                                let args = [].slice.call(arguments, 1, querySplit.length * 2).map(function (x, i) {
+                                    return i & 1 ? x : '<mark>' + x + '</mark>'; // eslint-disable-line no-bitwise
+                                });
 
-                                    return args.join('');
-                                }
-                            ;
+                                return args.join('');
+                            };
                             $.each(results, function (label, content) {
                                 $.each(settings.searchFields, function (index, field) {
-                                    var
-                                        fieldExists = typeof content[field] === 'string' || typeof content[field] === 'number'
-                                    ;
+                                    let fieldExists = typeof content[field] === 'string' || typeof content[field] === 'number';
                                     if (fieldExists) {
-                                        var markedHTML = typeof content[field] === 'string'
+                                        let markedHTML = typeof content[field] === 'string'
                                             ? content[field]
                                             : content[field].toString();
                                         if (settings.ignoreDiacritics) {
@@ -1202,11 +1121,9 @@
                 },
                 performance: {
                     log: function (message) {
-                        var
-                            currentTime,
-                            executionTime,
-                            previousTime
-                        ;
+                        let currentTime;
+                        let executionTime;
+                        let previousTime;
                         if (settings.performance) {
                             currentTime = Date.now();
                             previousTime = time || currentTime;
@@ -1225,10 +1142,8 @@
                         }, 500);
                     },
                     display: function () {
-                        var
-                            title = settings.name + ':',
-                            totalTime = 0
-                        ;
+                        let title = settings.name + ':';
+                        let totalTime = 0;
                         time = false;
                         clearTimeout(module.performance.timer);
                         $.each(performance, function (index, data) {
@@ -1253,22 +1168,19 @@
                     },
                 },
                 invoke: function (query, passedArguments, context) {
-                    var
-                        object = instance,
-                        maxDepth,
-                        found,
-                        response
-                    ;
+                    let object = instance;
+                    let maxDepth;
+                    let found;
+                    let response;
                     passedArguments = passedArguments || queryArguments;
                     context = context || element;
                     if (typeof query === 'string' && object !== undefined) {
                         query = query.split(/[ .]/);
                         maxDepth = query.length - 1;
                         $.each(query, function (depth, value) {
-                            var camelCaseValue = depth !== maxDepth
+                            let camelCaseValue = depth !== maxDepth
                                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
-                                : query
-                            ;
+                                : query;
                             if ($.isPlainObject(object[camelCaseValue]) && (depth !== maxDepth)) {
                                 object = object[camelCaseValue];
                             } else if (object[camelCaseValue] !== undefined) {
@@ -1475,32 +1387,25 @@
                 if (settings !== undefined && settings.preserveHTML) {
                     return string;
                 }
-                var
-                    badChars     = /["'<>]/g,
-                    shouldEscape = /["&'<>]/,
-                    escape       = {
-                        '<': '&lt;',
-                        '>': '&gt;',
-                        '"': '&quot;',
-                        "'": '&apos;',
-                    },
-                    escapedChar  = function (chr) {
-                        return escape[chr];
-                    }
-                ;
-                if (shouldEscape.test(string)) {
-                    string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
-                    string = string.replace(badChars, escapedChar);
-                    // FUI controlled HTML is still allowed
-                    string = string.replace(/&lt;(\/)*mark&gt;/g, '<$1mark>');
-                }
+
+                const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                const escape = {
+                    '"': '&quot;',
+                    '&': '&amp;',
+                    "'": '&apos;',
+                    '<': '&lt;',
+                    '>': '&gt;',
+                };
+
+                string = string.replace(badChars, (chr) => escape[chr]);
+
+                // FUI controlled HTML is still allowed
+                string = string.replace(/&lt;(\/)*mark&gt;/g, '<$1mark>');
 
                 return string;
             },
             message: function (message, type, header) {
-                var
-                    html = ''
-                ;
+                let html = '';
                 if (message !== undefined && type !== undefined) {
                     html += ''
                         + '<div class="message ' + type + '">';
@@ -1515,11 +1420,9 @@
                 return html;
             },
             category: function (response, settings) {
-                var
-                    html = '',
-                    fields = settings.fields,
-                    escape = settings.templates.escape
-                ;
+                let html = '';
+                let fields = settings.fields;
+                let escape = settings.templates.escape;
                 if (response[fields.categoryResults] !== undefined) {
                     // each category
                     $.each(response[fields.categoryResults], function (index, category) {
@@ -1579,11 +1482,9 @@
                 return false;
             },
             standard: function (response, settings) {
-                var
-                    html = '',
-                    fields = settings.fields,
-                    escape = settings.templates.escape
-                ;
+                let html = '';
+                let fields = settings.fields;
+                let escape = settings.templates.escape;
                 if (response[fields.results] !== undefined) {
                     // each result
                     $.each(response[fields.results], function (index, result) {