fomantic-ui 2.9.4-beta.31 → 2.9.4-beta.33

package/dist/semantic.js

@@ -1,5 +1,5 @@
 /*
- * # Fomantic UI - 2.9.4-beta.31+5437960
+ * # Fomantic UI - 2.9.4-beta.33+6daf34d
  * https://github.com/fomantic/Fomantic-UI
  * https://fomantic-ui.com/
  *
@@ -9,7 +9,7 @@
  *
  */
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Site
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Site
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -465,7 +465,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Form Validation
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Form Validation
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -2647,7 +2647,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Accordion
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Accordion
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -3243,7 +3243,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Calendar
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Calendar
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -5256,7 +5256,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Checkbox
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Checkbox
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -6141,7 +6141,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Dimmer
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Dimmer
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -6874,7 +6874,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Dropdown
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Dropdown
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -7765,11 +7765,13 @@
                                 ? query
                                 : module.get.query()
                         ),
-                        results          =  null,
-                        escapedTerm      = module.escape.string(searchTerm),
-                        regExpFlags      = (settings.ignoreSearchCase ? 'i' : '') + 'gm',
+                        results = null,
+                        escapedTerm = module.escape.string(searchTerm),
+                        regExpIgnore = settings.ignoreSearchCase ? 'i' : '',
+                        regExpFlags = regExpIgnore + 'gm',
                         beginsWithRegExp = new RegExp('^' + escapedTerm, regExpFlags)
                     ;
+                    module.remove.filteredItem();
                     // avoid loop if we're matching nothing
                     if (module.has.query()) {
                         results = [];
@@ -7813,12 +7815,34 @@
                         ;
                     }
                     module.debug('Showing only matched items', searchTerm);
-                    module.remove.filteredItem();
                     if (results) {
                         $item
                             .not(results)
                             .addClass(className.filtered)
                         ;
+                        if (settings.highlightMatches && (settings.match === 'both' || settings.match === 'text')) {
+                            var querySplit = query.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
+                                    });
+
+                                    return args.join('');
+                                }
+                            ;
+                            $.each(results, function (index, result) {
+                                var $result = $(result),
+                                    markedHTML = module.get.choiceText($result, true)
+                                ;
+                                if (settings.ignoreDiacritics) {
+                                    markedHTML = markedHTML.normalize('NFD');
+                                }
+                                $result.html(markedHTML.replace(markedRegExp, markedReplacer));
+                            });
+                        }
                     }
 
                     if (!module.has.query()) {
@@ -7854,8 +7878,10 @@
                         termLength  = term.length,
                         queryLength = query.length
                     ;
-                    query = settings.ignoreSearchCase ? query.toLowerCase() : query;
-                    term = settings.ignoreSearchCase ? term.toLowerCase() : term;
+                    if (settings.ignoreSearchCase) {
+                        query = query.toLowerCase();
+                        term = term.toLowerCase();
+                    }
                     if (queryLength > termLength) {
                         return false;
                     }
@@ -8062,7 +8088,7 @@
                                 if (!itemActivated && !pageLostFocus) {
                                     if (settings.forceSelection) {
                                         module.forceSelection();
-                                    } else if (!settings.allowAdditions) {
+                                    } else if (!settings.allowAdditions && !settings.keepSearchTerm && !module.has.menuSearch()) {
                                         module.remove.searchTerm();
                                     }
                                     module.hide();
@@ -9959,6 +9985,12 @@
                         $item.removeClass(className.active);
                     },
                     filteredItem: function () {
+                        if (settings.highlightMatches) {
+                            $.each($item, function (index, item) {
+                                var $markItem = $(item);
+                                $markItem.html($markItem.html().replace(/<\/?mark>/g, ''));
+                            });
+                        }
                         if (settings.useLabels && module.has.maxSelections()) {
                             return;
                         }
@@ -10668,6 +10700,7 @@
                         return text.replace(regExp.escape, '\\$&');
                     },
                     htmlEntities: function (string, forceAmpersand) {
+                        forceAmpersand = typeof forceAmpersand === 'number' ? false : forceAmpersand;
                         var
                             badChars     = /["'<>`]/g,
                             shouldEscape = /["&'<>`]/,
@@ -10684,8 +10717,7 @@
                         ;
                         if (shouldEscape.test(string)) {
                             string = string.replace(forceAmpersand ? /&/g : /&(?![\d#a-z]{1,12};)/gi, '&amp;');
-
-                            return string.replace(badChars, escapedChar);
+                            string = string.replace(badChars, escapedChar);
                         }
 
                         return string;
@@ -10890,6 +10922,7 @@
 
         match: 'both', // what to match against with search selection (both, text, or label)
         fullTextSearch: 'exact', // search anywhere in value (set to 'exact' to require exact matches)
+        highlightMatches: false, // Whether search result should highlight matching strings
         ignoreDiacritics: false, // match results also if they contain diacritics of the same base character (for example searching for "a" will also match "á" or "â" or "à", etc...)
         hideDividers: false, // Whether to hide any divider elements (specified in selector.divider) that are sibling to any items when searched (set to true will hide all dividers, set to 'empty' will hide them when they are not followed by a visible item)
 
@@ -11114,8 +11147,7 @@
             ;
             if (shouldEscape.test(string)) {
                 string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
-
-                return string.replace(badChars, escapedChar);
+                string = string.replace(badChars, escapedChar);
             }
 
             return string;
@@ -11242,7 +11274,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Embed
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Embed
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -11923,7 +11955,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Flyout
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Flyout
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -13475,7 +13507,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Modal
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Modal
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -15113,7 +15145,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Nag
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Nag
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -15260,8 +15292,10 @@
                         module.debug('Dismissing nag', settings.storageMethod, settings.key, settings.value, settings.expires);
                         module.storage.set(settings.key, settings.value);
                     }
-                    event.stopImmediatePropagation();
-                    event.preventDefault();
+                    if (event) {
+                        event.stopImmediatePropagation();
+                        event.preventDefault();
+                    }
                 },
 
                 should: {
@@ -15678,7 +15712,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Popup
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Popup
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -17240,7 +17274,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Progress
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Progress
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -18220,7 +18254,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Slider
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Slider
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -19671,7 +19705,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Rating
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Rating
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -20212,7 +20246,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Search
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Search
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -20348,7 +20382,10 @@
                         // this makes sure $.extend does not add specified search fields to default fields
                         // this is the only setting which should not extend defaults
                         if (parameters && parameters.searchFields !== undefined) {
-                            settings.searchFields = parameters.searchFields;
+                            settings.searchFields = Array.isArray(parameters.searchFields)
+                                ? parameters.searchFields
+                                : [parameters.searchFields]
+                            ;
                         }
                     },
                 },
@@ -20844,7 +20881,7 @@
                             exactResults = [],
                             fuzzyResults = [],
                             searchExp    = searchTerm.replace(regExp.escape, '\\$&'),
-                            matchRegExp  = new RegExp(regExp.beginsWith + searchExp, 'i'),
+                            matchRegExp = new RegExp(regExp.beginsWith + searchExp, settings.ignoreSearchCase ? 'i' : ''),
 
                             // avoid duplicates when pushing results
                             addResult = function (array, result) {
@@ -20880,13 +20917,14 @@
                             var concatenatedContent = [];
                             $.each(searchFields, function (index, field) {
                                 var
-                                    fieldExists = (typeof content[field] === 'string') || (typeof content[field] === 'number')
+                                    fieldExists = typeof content[field] === 'string' || typeof content[field] === 'number'
                                 ;
                                 if (fieldExists) {
                                     var text;
                                     text = typeof content[field] === 'string'
                                         ? module.remove.diacritics(content[field])
                                         : content[field].toString();
+                                    text = $('<div/>', { html: text }).text().trim();
                                     if (settings.fullTextSearch === 'all') {
                                         concatenatedContent.push(text);
                                         if (index < lastSearchFieldIndex) {
@@ -20917,8 +20955,10 @@
                     },
                 },
                 exactSearch: function (query, term) {
-                    query = query.toLowerCase();
-                    term = term.toLowerCase();
+                    if (settings.ignoreSearchCase) {
+                        query = query.toLowerCase();
+                        term = term.toLowerCase();
+                    }
 
                     return term.indexOf(query) > -1;
                 },
@@ -20945,8 +20985,10 @@
                     if (typeof query !== 'string') {
                         return false;
                     }
-                    query = query.toLowerCase();
-                    term = term.toLowerCase();
+                    if (settings.ignoreSearchCase) {
+                        query = query.toLowerCase();
+                        term = term.toLowerCase();
+                    }
                     if (queryLength > termLength) {
                         return false;
                     }
@@ -21301,6 +21343,39 @@
                                 response[fields.results] = response[fields.results].slice(0, settings.maxResults);
                             }
                         }
+                        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
+                                    });
+
+                                    return args.join('');
+                                }
+                            ;
+                            $.each(results, function (label, content) {
+                                $.each(settings.searchFields, function (index, field) {
+                                    var
+                                        fieldExists = typeof content[field] === 'string' || typeof content[field] === 'number'
+                                    ;
+                                    if (fieldExists) {
+                                        var markedHTML = typeof content[field] === 'string'
+                                            ? content[field]
+                                            : content[field].toString();
+                                        if (settings.ignoreDiacritics) {
+                                            markedHTML = markedHTML.normalize('NFD');
+                                        }
+                                        markedHTML = markedHTML.replace(/<\/?mark>/g, '');
+                                        response[fields.results][label][field] = markedHTML.replace(markedRegExp, markedReplacer);
+                                    }
+                                });
+                            });
+                        }
                         if (isFunction(template)) {
                             html = template(response, fields, settings.preserveHTML);
                         } else {
@@ -21529,9 +21604,15 @@
         // search anywhere in value (set to 'exact' to require exact matches
         fullTextSearch: 'exact',
 
+        // Whether search result should highlight matching strings
+        highlightMatches: false,
+
         // match results also if they contain diacritics of the same base character (for example searching for "a" will also match "á" or "â" or "à", etc...)
         ignoreDiacritics: false,
 
+        // whether to consider case sensitivity on local searching
+        ignoreSearchCase: true,
+
         // whether to add events to prompt automatically
         automatic: true,
 
@@ -21649,8 +21730,9 @@
                     };
                 if (shouldEscape.test(string)) {
                     string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
-
-                    return string.replace(badChars, escapedChar);
+                    string = string.replace(badChars, escapedChar);
+                    // FUI controlled HTML is still allowed
+                    string = string.replace(/&lt;(\/)*mark&gt;/g, '<$1mark>');
                 }
 
                 return string;
@@ -21794,7 +21876,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Shape
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Shape
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -22592,7 +22674,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Sidebar
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Sidebar
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -23647,7 +23729,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Sticky
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Sticky
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -24565,7 +24647,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Tab
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Tab
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -25533,7 +25615,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Toast
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Toast
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -26496,7 +26578,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Transition
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Transition
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -27531,7 +27613,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - API
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - API
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -28757,7 +28839,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - State
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - State
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -29455,7 +29537,7 @@
 })(jQuery, window, document);
 
 /*!
- * # Fomantic-UI 2.9.4-beta.31+5437960 - Visibility
+ * # Fomantic-UI 2.9.4-beta.33+6daf34d - Visibility
  * https://github.com/fomantic/Fomantic-UI/
  *
  *