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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fomantic-ui",
-  "version": "2.10.0-beta.6+42a411a",
+  "version": "2.10.0-beta.7+13b1bae",
   "description": "Fomantic empowers designers and developers by creating a shared vocabulary for UI.",
   "keywords": [
     "fomantic-ui",

package/src/definitions/modules/dropdown.js

@@ -1757,6 +1757,7 @@
                                 }
                                 // down arrow (open menu)
                                 if (pressedKey === keys.downArrow && !module.is.visible()) {
+                                    focused = true;
                                     module.verbose('Down key pressed, showing dropdown');
                                     module.show();
                                     event.preventDefault();
@@ -3835,25 +3836,19 @@
                     },
                     htmlEntities: function (string, forceAmpersand) {
                         forceAmpersand = typeof forceAmpersand === 'number' ? false : forceAmpersand;
-                        var
-                            badChars     = /["'<>]/g,
-                            shouldEscape = /["&'<>]/,
-                            escape       = {
-                                '<': '&lt;',
-                                '>': '&gt;',
-                                '"': '&quot;',
-                                "'": '&apos;',
-                            },
-                            escapedChar  = function (chr) {
-                                return escape[chr];
-                            }
-                        ;
-                        if (shouldEscape.test(string)) {
-                            string = string.replace(forceAmpersand ? /&/g : /&(?![\d#a-z]{1,12};)/gi, '&amp;');
-                            string = string.replace(badChars, escapedChar);
-                        }
 
-                        return string;
+                        const badChars = forceAmpersand
+                            ? /["&'<>]/g
+                            : /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                        const escape = {
+                            '"': '&quot;',
+                            '&': '&amp;',
+                            "'": '&apos;',
+                            '<': '&lt;',
+                            '>': '&gt;',
+                        };
+
+                        return string.replace(badChars, (chr) => escape[chr]);
                     },
                 },
 
@@ -4263,25 +4258,17 @@
             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);
-            }
 
-            return string;
+            const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+            const escape = {
+                '"': '&quot;',
+                '&': '&amp;',
+                "'": '&apos;',
+                '<': '&lt;',
+                '>': '&gt;',
+            };
+
+            return string.replace(badChars, (chr) => escape[chr]);
         },
         // generates dropdown from select values
         dropdown: function (select, settings) {

package/src/definitions/modules/embed.js

@@ -646,25 +646,16 @@
 
         templates: {
             escape: function (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);
-                }
-
-                return string;
+                const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                const escape = {
+                    '"': '&quot;',
+                    '&': '&amp;',
+                    "'": '&apos;',
+                    '<': '&lt;',
+                    '>': '&gt;',
+                };
+
+                return string.replace(badChars, (chr) => escape[chr]);
             },
             iframe: function (url, parameters) {
                 var

package/src/definitions/modules/flyout.js

@@ -1083,25 +1083,17 @@
                         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);
-                        }
 
-                        return string;
+                        const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                        const escape = {
+                            '"': '&quot;',
+                            '&': '&amp;',
+                            "'": '&apos;',
+                            '<': '&lt;',
+                            '>': '&gt;',
+                        };
+
+                        return string.replace(badChars, (chr) => escape[chr]);
                     },
                 },
 

package/src/definitions/modules/modal.js

@@ -931,25 +931,17 @@
                         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);
-                        }
 
-                        return string;
+                        const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                        const escape = {
+                            '"': '&quot;',
+                            '&': '&amp;',
+                            "'": '&apos;',
+                            '<': '&lt;',
+                            '>': '&gt;',
+                        };
+
+                        return string.replace(badChars, (chr) => escape[chr]);
                     },
                 },
                 can: {

package/src/definitions/modules/popup.js

@@ -1515,25 +1515,16 @@
 
         templates: {
             escape: function (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);
-                }
-
-                return string;
+                const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                const escape = {
+                    '"': '&quot;',
+                    '&': '&amp;',
+                    "'": '&apos;',
+                    '<': '&lt;',
+                    '>': '&gt;',
+                };
+
+                return string.replace(badChars, (chr) => escape[chr]);
             },
             popup: function (text) {
                 var

package/src/definitions/modules/rating.js

@@ -519,25 +519,16 @@
 
         templates: {
             escape: function (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);
-                }
-
-                return string;
+                const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                const escape = {
+                    '"': '&quot;',
+                    '&': '&amp;',
+                    "'": '&apos;',
+                    '<': '&lt;',
+                    '>': '&gt;',
+                };
+
+                return string.replace(badChars, (chr) => escape[chr]);
             },
             icon: function (maxRating, iconClass) {
                 var

package/src/definitions/modules/search.js

@@ -1475,25 +1475,20 @@
                 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;
             },

package/src/definitions/modules/toast.js

@@ -596,25 +596,17 @@
                         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);
-                        }
 
-                        return string;
+                        const badChars = /["'<>]|&(?![\d#A-Za-z]{1,12};)/g;
+                        const escape = {
+                            '"': '&quot;',
+                            '&': '&amp;',
+                            "'": '&apos;',
+                            '<': '&lt;',
+                            '>': '&gt;',
+                        };
+
+                        return string.replace(badChars, (chr) => escape[chr]);
                     },
                 },