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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fomantic-ui",
-  "version": "2.10.0-beta.5+789e0d0",
+  "version": "2.10.0-beta.6+42a411a",
   "description": "Fomantic empowers designers and developers by creating a shared vocabulary for UI.",
   "keywords": [
     "fomantic-ui",
@@ -69,7 +69,6 @@
     "ordered-read-streams": "^1.0.1",
     "replace-ext": "^1.0.0",
     "require-dot-file": "^0.4.0",
-    "wrench-sui": "^0.0.3",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {

package/src/definitions/modules/dropdown.js

@@ -114,11 +114,6 @@
                     if (module.is.alreadySetup()) {
                         module.setup.reference();
                     } else {
-                        if (settings.ignoreDiacritics && !String.prototype.normalize) {
-                            settings.ignoreDiacritics = false;
-                            module.error(error.noNormalize, element);
-                        }
-
                         module.create.id();
                         module.setup.layout();
 
@@ -1110,7 +1105,7 @@
                             $input.append('<option disabled selected value></option>');
                             $.each(values, function (index, item) {
                                 var
-                                    value = settings.templates.deQuote(item[fields.value]),
+                                    value = settings.templates.escape(item[fields.value]),
                                     name = settings.templates.escape(
                                         item[fields.name] || '',
                                         settings
@@ -3841,14 +3836,13 @@
                     htmlEntities: function (string, forceAmpersand) {
                         forceAmpersand = typeof forceAmpersand === 'number' ? false : forceAmpersand;
                         var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
+                            badChars     = /["'<>]/g,
+                            shouldEscape = /["&'<>]/,
                             escape       = {
                                 '<': '&lt;',
                                 '>': '&gt;',
                                 '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
+                                "'": '&apos;',
                             },
                             escapedChar  = function (chr) {
                                 return escape[chr];
@@ -4152,7 +4146,6 @@
             noAPI: 'The API module is required to load resources remotely',
             noStorage: 'Saving remote data requires session storage',
             noElement: 'This module requires ui {element}',
-            noNormalize: '"ignoreDiacritics" setting will be ignored. Browser does not support String().normalize(). You may consider including <https://cdn.jsdelivr.net/npm/unorm@1.4.1/lib/unorm.min.js> as a polyfill.',
         },
 
         regExp: {
@@ -4266,22 +4259,18 @@
 
     /* Templates */
     $.fn.dropdown.settings.templates = {
-        deQuote: function (string, encode) {
-            return String(string).replace(/"/g, encode ? '&quot;' : '');
-        },
         escape: function (string, settings) {
-            if (settings.preserveHTML) {
+            if (settings !== undefined && settings.preserveHTML) {
                 return string;
             }
             var
-                badChars     = /["'<>`]/g,
-                shouldEscape = /["&'<>`]/,
+                badChars     = /["'<>]/g,
+                shouldEscape = /["&'<>]/,
                 escape       = {
                     '<': '&lt;',
                     '>': '&gt;',
                     '"': '&quot;',
-                    "'": '&#x27;',
-                    '`': '&#x60;',
+                    "'": '&apos;',
                 },
                 escapedChar  = function (chr) {
                     return escape[chr];
@@ -4300,14 +4289,13 @@
                 placeholder = select.placeholder || false,
                 html = '',
                 className = settings.className,
-                escape = settings.templates.escape,
-                deQuote = settings.templates.deQuote
+                escape = settings.templates.escape
             ;
             html += '<i class="dropdown icon"></i>';
             html += placeholder
                 ? '<div class="default text">' + escape(placeholder, settings) + '</div>'
                 : '<div class="text"></div>';
-            html += '<div class="' + deQuote(className.menu) + '">';
+            html += '<div class="' + escape(className.menu) + '">';
             html += settings.templates.menu(select, settings);
             html += '</div>';
 
@@ -4321,8 +4309,7 @@
                 values = response[fields.values] || [],
                 html = '',
                 className = settings.className,
-                escape = settings.templates.escape,
-                deQuote = settings.templates.deQuote
+                escape = settings.templates.escape
             ;
             $.each(values, function (index, option) {
                 var
@@ -4338,14 +4325,14 @@
                     for (dataKey in dataObject) {
                         dataKeyEscaped = String(dataKey).replace(/\W/g, '');
                         if (Object.prototype.hasOwnProperty.call(dataObject, dataKey) && ['text', 'value'].indexOf(dataKeyEscaped.toLowerCase()) === -1) {
-                            maybeData += ' data-' + dataKeyEscaped + '="' + deQuote(String(dataObject[dataKey])) + '"';
+                            maybeData += ' data-' + dataKeyEscaped + '="' + escape(String(dataObject[dataKey])) + '"';
                         }
                     }
                 }
                 if (itemType === 'item' || isMenu) {
                     var
                         maybeText = option[fields.text]
-                            ? ' data-text="' + deQuote(option[fields.text], true) + '"'
+                            ? ' data-text="' + escape(option[fields.text]) + '"'
                             : '',
                         maybeActionable = option[fields.actionable]
                             ? className.actionable + ' '
@@ -4358,27 +4345,27 @@
                             : '',
                         hasDescription = escape(option[fields.description] || '', settings) !== ''
                     ;
-                    html += '<div class="' + deQuote(maybeActionable + maybeDisabled + maybeDescriptionVertical + (option[fields.class] || className.item)) + '" data-value="' + deQuote(option[fields.value], true) + '"' + maybeText + maybeData + '>';
+                    html += '<div class="' + escape(maybeActionable + maybeDisabled + maybeDescriptionVertical + (option[fields.class] || className.item)) + '" data-value="' + escape(option[fields.value]) + '"' + maybeText + maybeData + '>';
                     if (isMenu) {
                         html += '<i class="' + (itemType.indexOf('left') !== -1 ? 'left' : '') + ' dropdown icon"></i>';
                     }
                     if (option[fields.image]) {
-                        html += '<img class="' + deQuote(option[fields.imageClass] || className.image) + '" src="' + deQuote(option[fields.image]) + (option[fields.alt] ? '" alt="' + deQuote(option[fields.alt]) : '') + '">';
+                        html += '<img class="' + escape(option[fields.imageClass] || className.image) + '" src="' + escape(option[fields.image]) + '"' + (option[fields.alt] ? ' alt="' + escape(option[fields.alt]) + '"' : '') + '>';
                     }
                     if (option[fields.icon]) {
-                        html += '<i class="' + deQuote(option[fields.icon] + ' ' + (option[fields.iconClass] || className.icon)) + '"></i>';
+                        html += '<i class="' + escape(option[fields.icon] + ' ' + (option[fields.iconClass] || className.icon)) + '"></i>';
                     }
                     if (hasDescription) {
-                        html += '<span class="' + deQuote(className.description) + '">' + escape(option[fields.description] || '', settings) + '</span>';
-                        html += !isMenu ? '<span class="' + deQuote(className.text) + '">' : '';
+                        html += '<span class="' + escape(className.description) + '">' + escape(option[fields.description] || '', settings) + '</span>';
+                        html += !isMenu ? '<span class="' + escape(className.text) + '">' : '';
                     }
                     if (isMenu) {
-                        html += '<span class="' + deQuote(className.text) + '">';
+                        html += '<span class="' + escape(className.text) + '">';
                     }
                     html += escape(option[fields.name] || '', settings);
                     if (isMenu) {
                         html += '</span>';
-                        html += '<div class="' + deQuote(itemType) + '">';
+                        html += '<div class="' + escape(itemType) + '">';
                         html += settings.templates.menu(option, settings);
                         html += '</div>';
                     } else if (hasDescription) {
@@ -4387,19 +4374,19 @@
                     html += '</div>';
                 } else if (itemType === 'header') {
                     var
-                        groupName = escape(option[fields.name] || '', settings),
-                        groupIcon = deQuote(option[fields.icon] || className.groupIcon)
+                        groupName = option[fields.name] || '',
+                        groupIcon = option[fields.icon] || className.groupIcon
                     ;
                     if (groupName !== '' || groupIcon !== '') {
-                        html += '<div class="' + deQuote(option[fields.class] || className.header) + '">';
+                        html += '<div class="' + escape(option[fields.class] || className.header) + '">';
                         if (groupIcon !== '') {
-                            html += '<i class="' + deQuote(groupIcon + ' ' + (option[fields.iconClass] || className.icon)) + '"></i>';
+                            html += '<i class="' + escape(groupIcon + ' ' + (option[fields.iconClass] || className.icon)) + '"></i>';
                         }
-                        html += groupName;
+                        html += escape(groupName, settings);
                         html += '</div>';
                     }
                     if (option[fields.divider]) {
-                        html += '<div class="' + deQuote(className.divider) + '"></div>';
+                        html += '<div class="' + escape(className.divider) + '"></div>';
                     }
                 }
             });
@@ -4411,11 +4398,10 @@
         label: function (value, text, settings) {
             var
                 className = settings.className,
-                escape = settings.templates.escape,
-                deQuote = settings.templates.deQuote
+                escape = settings.templates.escape
             ;
 
-            return escape(text, settings) + '<i class="' + deQuote(className.delete) + ' icon"></i>';
+            return escape(text, settings) + '<i class="' + escape(className.delete) + ' icon"></i>';
         },
 
         // generates messages like "No results"

package/src/definitions/modules/embed.js

@@ -645,33 +645,51 @@
         },
 
         templates: {
-            deQuote: function (string, encode) {
-                return String(string).replace(/"/g, encode ? '"' : '');
+            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;
             },
             iframe: function (url, parameters) {
                 var
                     src = url,
-                    deQuote = $.fn.embed.settings.templates.deQuote
+                    escape = $.fn.embed.settings.templates.escape
                 ;
                 if (parameters) {
                     src += '?' + parameters;
                 }
 
                 return ''
-                    + '<iframe src="' + deQuote(src) + '"'
+                    + '<iframe src="' + escape(src) + '"'
                     + ' width="100%" height="100%"'
                     + ' msallowFullScreen allowFullScreen></iframe>';
             },
             placeholder: function (image, icon, alt) {
                 var
                     html = '',
-                    deQuote = $.fn.embed.settings.templates.deQuote
+                    escape = $.fn.embed.settings.templates.escape
                 ;
                 if (icon) {
-                    html += '<i class="' + deQuote(icon) + ' icon"></i>';
+                    html += '<i class="' + escape(icon) + ' icon"></i>';
                 }
                 if (image) {
-                    html += '<img class="placeholder" src="' + deQuote(image) + (alt ? '" alt="' + deQuote(alt) : '') + '">';
+                    html += '<img class="placeholder" src="' + escape(image) + '"' + (alt ? ' alt="' + escape(alt) + '"' : '') + '>';
                 }
 
                 return html;

package/src/definitions/modules/flyout.js

@@ -117,10 +117,10 @@
                     }
                     $module.addClass(settings.class);
                     if (settings.title !== '') {
-                        $module.find(selector.header).html(module.helpers.escape(settings.title)).addClass(settings.classTitle);
+                        $module.find(selector.header).html(module.helpers.escape(settings.title, settings)).addClass(settings.classTitle);
                     }
                     if (settings.content !== '') {
-                        $module.find(selector.content).html(module.helpers.escape(settings.content)).addClass(settings.classContent);
+                        $module.find(selector.content).html(module.helpers.escape(settings.content, settings)).addClass(settings.classContent);
                     }
                     if (module.has.configActions()) {
                         var $actions = $module.find(selector.actions).addClass(settings.classActions);
@@ -132,10 +132,10 @@
                         settings.actions.forEach(function (el) {
                             var
                                 icon = el[fields.icon]
-                                    ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '') + ' class="' + module.helpers.deQuote(el[fields.icon]) + ' icon"></i>'
+                                    ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '') + ' class="' + module.helpers.escape(el[fields.icon]) + ' icon"></i>'
                                     : '',
-                                text = module.helpers.escape(el[fields.text] || ''),
-                                cls = module.helpers.deQuote(el[fields.class] || ''),
+                                text = module.helpers.escape(el[fields.text] || '', settings),
+                                cls = module.helpers.escape(el[fields.class] || ''),
                                 click = el[fields.click] && isFunction(el[fields.click])
                                     ? el[fields.click]
                                     : function () {}
@@ -1079,22 +1079,18 @@
                 },
 
                 helpers: {
-                    deQuote: function (string) {
-                        return String(string).replace(/"/g, '');
-                    },
-                    escape: function (string) {
-                        if (settings.preserveHTML) {
+                    escape: function (string, settings) {
+                        if (settings !== undefined && settings.preserveHTML) {
                             return string;
                         }
                         var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
+                            badChars     = /["'<>]/g,
+                            shouldEscape = /["&'<>]/,
                             escape       = {
                                 '<': '&lt;',
                                 '>': '&gt;',
                                 '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
+                                "'": '&apos;',
                             },
                             escapedChar  = function (chr) {
                                 return escape[chr];
@@ -1102,8 +1098,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;
@@ -1482,7 +1477,7 @@
                 input    = $($.parseHTML(args.content)).filter('.ui.input')
             ;
             if (input.length === 0) {
-                args.content += '<p><div class="' + settings.className.prompt + '"><input placeholder="' + this.helpers.deQuote(args.placeholder || '') + '" type="text" value="' + this.helpers.deQuote(args.defaultValue || '') + '"></div></p>';
+                args.content += '<p><div class="' + settings.className.prompt + '"><input placeholder="' + this.helpers.escape(args.placeholder || '') + '" type="text" value="' + this.helpers.escape(args.defaultValue || '') + '"></div></p>';
             }
 
             return {

package/src/definitions/modules/modal.js

@@ -111,10 +111,10 @@
                     }
                     $module.addClass(settings.class);
                     if (settings.title !== '') {
-                        $module.find(selector.title).html(module.helpers.escape(settings.title)).addClass(settings.classTitle);
+                        $module.find(selector.title).html(module.helpers.escape(settings.title, settings)).addClass(settings.classTitle);
                     }
                     if (settings.content !== '') {
-                        $module.find(selector.content).html(module.helpers.escape(settings.content)).addClass(settings.classContent);
+                        $module.find(selector.content).html(module.helpers.escape(settings.content, settings)).addClass(settings.classContent);
                     }
                     if (module.has.configActions()) {
                         var $actions = $module.find(selector.actions).addClass(settings.classActions);
@@ -126,10 +126,10 @@
                         settings.actions.forEach(function (el) {
                             var
                                 icon = el[fields.icon]
-                                    ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '') + ' class="' + module.helpers.deQuote(el[fields.icon]) + ' icon"></i>'
+                                    ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '') + ' class="' + module.helpers.escape(el[fields.icon]) + ' icon"></i>'
                                     : '',
-                                text = module.helpers.escape(el[fields.text] || ''),
-                                cls = module.helpers.deQuote(el[fields.class] || ''),
+                                text = module.helpers.escape(el[fields.text] || '', settings),
+                                cls = module.helpers.escape(el[fields.class] || ''),
                                 click = el[fields.click] && isFunction(el[fields.click])
                                     ? el[fields.click]
                                     : function () {}
@@ -927,22 +927,18 @@
                     module.debug('Caching modal and container sizes', module.cache);
                 },
                 helpers: {
-                    deQuote: function (string) {
-                        return String(string).replace(/"/g, '');
-                    },
-                    escape: function (string) {
-                        if (settings.preserveHTML) {
+                    escape: function (string, settings) {
+                        if (settings !== undefined && settings.preserveHTML) {
                             return string;
                         }
                         var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
+                            badChars     = /["'<>]/g,
+                            shouldEscape = /["&'<>]/,
                             escape       = {
                                 '<': '&lt;',
                                 '>': '&gt;',
                                 '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
+                                "'": '&apos;',
                             },
                             escapedChar  = function (chr) {
                                 return escape[chr];
@@ -950,8 +946,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;
@@ -1590,7 +1585,7 @@
                 }
             ;
             if (input.length === 0) {
-                args.content += '<p><div class="' + this.helpers.deQuote(settings.className.prompt) + '"><input placeholder="' + this.helpers.deQuote(args.placeholder || '') + '" type="text" value="' + this.helpers.deQuote(args.defaultValue || '') + '"></div></p>';
+                args.content += '<p><div class="' + this.helpers.escape(settings.className.prompt) + '"><input placeholder="' + this.helpers.escape(args.placeholder || '') + '" type="text" value="' + this.helpers.escape(args.defaultValue || '') + '"></div></p>';
             }
 
             return {

package/src/definitions/modules/popup.js

@@ -1516,14 +1516,13 @@
         templates: {
             escape: function (string) {
                 var
-                    badChars     = /["'<>`]/g,
-                    shouldEscape = /["&'<>`]/,
+                    badChars     = /["'<>]/g,
+                    shouldEscape = /["&'<>]/,
                     escape       = {
                         '<': '&lt;',
                         '>': '&gt;',
                         '"': '&quot;',
-                        "'": '&#x27;',
-                        '`': '&#x60;',
+                        "'": '&apos;',
                     },
                     escapedChar  = function (chr) {
                         return escape[chr];
@@ -1531,8 +1530,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;

package/src/definitions/modules/rating.js

@@ -518,17 +518,35 @@
         },
 
         templates: {
-            deQuote: function (string, encode) {
-                return String(string).replace(/"/g, encode ? '"' : '');
+            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;
             },
             icon: function (maxRating, iconClass) {
                 var
                     icon = 1,
                     html = '',
-                    deQuote = $.fn.rating.settings.templates.deQuote
+                    escape = $.fn.rating.settings.templates.escape
                 ;
                 while (icon <= maxRating) {
-                    html += '<i class="' + deQuote(iconClass) + ' icon"></i>';
+                    html += '<i class="' + escape(iconClass) + ' icon"></i>';
                     icon++;
                 }
 

package/src/definitions/modules/search.js

@@ -461,10 +461,6 @@
                             settings.fullTextSearch = parameters.searchFullText;
                             module.error(settings.error.oldSearchSyntax, element);
                         }
-                        if (settings.ignoreDiacritics && !String.prototype.normalize) {
-                            settings.ignoreDiacritics = false;
-                            module.error(error.noNormalize, element);
-                        }
                     },
                     inputEvent: function () {
                         var
@@ -1433,7 +1429,6 @@
             serverError: 'There was an issue querying the server.',
             maxResults: 'Results must be an array to use maxResults setting',
             method: 'The method you called is not defined.',
-            noNormalize: '"ignoreDiacritics" setting will be ignored. Browser does not support String().normalize(). You may consider including <https://cdn.jsdelivr.net/npm/unorm@1.4.1/lib/unorm.min.js> as a polyfill.',
         },
 
         metadata: {
@@ -1477,22 +1472,22 @@
 
         templates: {
             escape: function (string, settings) {
-                if (settings.preserveHTML) {
+                if (settings !== undefined && settings.preserveHTML) {
                     return string;
                 }
                 var
-                    badChars     = /["'<>`]/g,
-                    shouldEscape = /["&'<>`]/,
+                    badChars     = /["'<>]/g,
+                    shouldEscape = /["&'<>]/,
                     escape       = {
                         '<': '&lt;',
                         '>': '&gt;',
                         '"': '&quot;',
-                        "'": '&#x27;',
-                        '`': '&#x60;',
+                        "'": '&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);
@@ -1544,7 +1539,7 @@
                                 if (result[fields.image] !== undefined) {
                                     html += ''
                                         + '<div class="image">'
-                                        + ' <img src="' + result[fields.image].replace(/"/g, '') + (result[fields.alt] ? '" alt="' + result[fields.alt].replace(/"/g, '') : '') + '">'
+                                        + ' <img src="' + result[fields.image].replace(/"/g, '') + '"' + (result[fields.alt] ? ' alt="' + result[fields.alt].replace(/"/g, '') + '"' : '') + '>'
                                         + '</div>';
                                 }
                                 html += '<div class="content">';
@@ -1598,7 +1593,7 @@
                         if (result[fields.image] !== undefined) {
                             html += ''
                                 + '<div class="image">'
-                                + ' <img src="' + result[fields.image].replace(/"/g, '') + (result[fields.alt] ? '" alt="' + result[fields.alt].replace(/"/g, '') : '') + '">'
+                                + ' <img src="' + result[fields.image].replace(/"/g, '') + '"' + (result[fields.alt] ? ' alt="' + result[fields.alt].replace(/"/g, '') + '"' : '') + '>'
                                 + '</div>';
                         }
                         html += '<div class="content">';

package/src/definitions/modules/toast.js

@@ -192,7 +192,7 @@
                                 $content.append($('<div/>', {
                                     class: className.title,
                                     id: titleId,
-                                    html: module.helpers.escape(settings.title),
+                                    html: module.helpers.escape(settings.title, settings),
                                 }));
                             }
                             var descId = '_' + module.get.id() + 'desc';
@@ -200,7 +200,7 @@
                             $content.append($('<div/>', {
                                 class: className.message,
                                 id: descId,
-                                html: module.helpers.escape(settings.message),
+                                html: module.helpers.escape(settings.message, settings),
                             }));
 
                             $toast
@@ -232,10 +232,10 @@
                                 $toast.find(selector.image).attr('src', settings.showImage).attr('alt', settings.alt || '');
                             }
                             if (settings.title !== '') {
-                                $toast.find(selector.title).html(module.helpers.escape(settings.title));
+                                $toast.find(selector.title).html(module.helpers.escape(settings.title, settings));
                             }
                             if (settings.message !== '') {
-                                $toast.find(selector.message).html(module.helpers.escape(settings.message));
+                                $toast.find(selector.message).html(module.helpers.escape(settings.message, settings));
                             }
                         }
                         if ($toast.hasClass(className.compact)) {
@@ -260,10 +260,10 @@
                                 var
                                     icon = el[fields.icon]
                                         ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '')
-                                            + ' class="' + module.helpers.deQuote(el[fields.icon]) + ' icon"></i>'
+                                            + ' class="' + module.helpers.escape(el[fields.icon]) + ' icon"></i>'
                                         : '',
-                                    text = module.helpers.escape(el[fields.text] || ''),
-                                    cls = module.helpers.deQuote(el[fields.class] || ''),
+                                    text = module.helpers.escape(el[fields.text] || '', settings),
+                                    cls = module.helpers.escape(el[fields.class] || ''),
                                     click = el[fields.click] && isFunction(el[fields.click])
                                         ? el[fields.click]
                                         : function () {}
@@ -592,22 +592,18 @@
 
                         return result;
                     },
-                    deQuote: function (string) {
-                        return String(string).replace(/"/g, '');
-                    },
-                    escape: function (string) {
-                        if (settings.preserveHTML) {
+                    escape: function (string, settings) {
+                        if (settings !== undefined && settings.preserveHTML) {
                             return string;
                         }
                         var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
+                            badChars     = /["'<>]/g,
+                            shouldEscape = /["&'<>]/,
                             escape       = {
                                 '<': '&lt;',
                                 '>': '&gt;',
                                 '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
+                                "'": '&apos;',
                             },
                             escapedChar  = function (chr) {
                                 return escape[chr];
@@ -615,8 +611,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;