fomantic-ui 2.10.0-beta.4 → 2.10.0-beta.41

package/dist/components/modal.js

@@ -1,5 +1,5 @@
 /*!
- * # Fomantic-UI 2.10.0-beta.4+fcf090f - Modal
+ * # Fomantic-UI 2.10.0-beta.41+1ceee9c - Modal
  * https://github.com/fomantic/Fomantic-UI/
  *
  *
@@ -20,82 +20,79 @@
         : globalThis;
 
     $.fn.modal = function (parameters) {
-        var
-            $allModules    = $(this),
-            $window        = $(window),
-            $document      = $(document),
-            $body          = $('body'),
-
-            time           = Date.now(),
-            performance    = [],
-
-            query          = arguments[0],
-            methodInvoked  = typeof query === 'string',
-            queryArguments = [].slice.call(arguments, 1),
-            contextCheck   = function (context, win) {
-                var $context;
-                if ([window, document].indexOf(context) >= 0) {
-                    $context = $body;
-                } else {
-                    $context = $(win.document).find(context);
-                    if ($context.length === 0) {
-                        $context = win.frameElement ? contextCheck(context, win.parent) : $body;
-                    }
+        let $allModules = $(this);
+        let $window = $(window);
+        let $document = $(document);
+        let $body = $('body');
+
+        let time = Date.now();
+        let performance = [];
+
+        let query = arguments[0];
+        let methodInvoked = typeof query === 'string';
+        let queryArguments = [].slice.call(arguments, 1);
+        let contextCheck = function (context, win) {
+            let $context;
+            if ([window, document].indexOf(context) >= 0) {
+                $context = $body;
+            } else {
+                $context = $(win.document).find(context);
+                if ($context.length === 0) {
+                    $context = win.frameElement ? contextCheck(context, win.parent) : $body;
                 }
+            }
 
-                return $context;
-            },
-            returnedValue
-        ;
+            return $context;
+        };
+        let returnedValue;
 
         $allModules.each(function () {
-            var
-                settings    = $.isPlainObject(parameters)
-                    ? $.extend(true, {}, $.fn.modal.settings, parameters)
-                    : $.extend({}, $.fn.modal.settings),
-
-                selector        = settings.selector,
-                className       = settings.className,
-                namespace       = settings.namespace,
-                fields          = settings.fields,
-                error           = settings.error,
-
-                eventNamespace  = '.' + namespace,
-                moduleNamespace = 'module-' + namespace,
-
-                $module         = $(this),
-                $context        = contextCheck(settings.context, window),
-                isBody          = $context[0] === $body[0],
-                $closeIcon      = $module.find(selector.closeIcon),
-                $inputs,
-
-                $allModals,
-                $otherModals,
-                $focusedElement,
-                $dimmable,
-                $dimmer,
-
-                isModalComponent = $module.hasClass('modal'),
-
-                element         = this,
-                instance        = isModalComponent ? $module.data(moduleNamespace) : undefined,
-
-                ignoreRepeatedEvents = false,
-
-                initialMouseDownInModal,
-                initialMouseDownInScrollbar,
-                initialBodyMargin = '',
-                tempBodyMargin = '',
-                keepScrollingClass = false,
-                hadScrollbar = false,
-                windowRefocused = false,
-
-                elementEventNamespace,
-                id,
-                observer,
-                observeAttributes = false,
-                module
-            ;
+            let settings = $.isPlainObject(parameters)
+                ? $.extend(true, {}, $.fn.modal.settings, parameters)
+                : $.extend({}, $.fn.modal.settings);
+
+            let selector = settings.selector;
+            let className = settings.className;
+            let namespace = settings.namespace;
+            let fields = settings.fields;
+            let error = settings.error;
+
+            let eventNamespace = '.' + namespace;
+            let moduleNamespace = 'module-' + namespace;
+
+            let $module = $(this);
+            let $context = contextCheck(settings.context, window);
+            let isBody = $context[0] === $body[0];
+            let $closeIcon = $module.find(selector.closeIcon);
+            let $inputs;
+
+            let $allModals;
+            let $otherModals;
+            let $focusedElement;
+            let $dimmable;
+            let $dimmer;
+
+            let isModalComponent = $module.hasClass('modal');
+
+            let element = this;
+            let instance = isModalComponent ? $module.data(moduleNamespace) : undefined;
+
+            let ignoreRepeatedEvents = false;
+
+            let initialMouseDownInModal;
+            let initialMouseDownInScrollbar;
+            let initialBodyMargin = '';
+            let initialBodyMarginInt = 0;
+            let tempBodyMargin = 0;
+            let keepScrollingClass = false;
+            let hadScrollbar = false;
+            let windowRefocused = false;
+
+            let elementEventNamespace;
+            let id;
+            let observer;
+            let observeAttributes = false;
+            let module;
             module = {
 
                 initialize: function () {
@@ -111,36 +108,34 @@
                     }
                     $module.addClass(settings.class);
                     if (settings.title !== '') {
-                        $module.find(selector.title).html(module.helpers.escape(settings.title, settings.preserveHTML)).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, settings.preserveHTML)).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);
+                        let $actions = $module.find(selector.actions).addClass(settings.classActions);
                         if ($actions.length === 0) {
                             $actions = $('<div/>', { class: className.actions + ' ' + (settings.classActions || '') }).appendTo($module);
                         } else {
                             $actions.empty();
                         }
                         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>'
-                                    : '',
-                                text = module.helpers.escape(el[fields.text] || '', settings.preserveHTML),
-                                cls = module.helpers.deQuote(el[fields.class] || ''),
-                                click = el[fields.click] && isFunction(el[fields.click])
-                                    ? el[fields.click]
-                                    : function () {}
-                            ;
+                            let icon = el[fields.icon]
+                                ? '<i ' + (el[fields.text] ? 'aria-hidden="true"' : '') + ' class="' + module.helpers.escape(el[fields.icon]) + ' icon"></i>'
+                                : '';
+                            let text = module.helpers.escape(el[fields.text] || '', settings);
+                            let cls = module.helpers.escape(el[fields.class] || '');
+                            let click = el[fields.click] && isFunction(el[fields.click])
+                                ? el[fields.click]
+                                : function () {};
                             $actions.append($('<button/>', {
                                 html: icon + text,
                                 'aria-label': (el[fields.text] || el[fields.icon] || '').replace(/<[^>]+(>|$)/g, ''),
                                 class: className.button + ' ' + cls,
                                 on: {
                                     click: function () {
-                                        var button = $(this);
+                                        let button = $(this);
                                         if (button.is(selector.approve) || button.is(selector.deny) || click.call(element, $module) === false) {
                                             return;
                                         }
@@ -174,8 +169,7 @@
                     module.verbose('Storing instance of modal');
                     instance = module;
                     $module
-                        .data(moduleNamespace, instance)
-                    ;
+                        .data(moduleNamespace, instance);
                 },
 
                 create: {
@@ -191,12 +185,12 @@
                             $module.append($closeIcon);
                         }
                         if (settings.title !== '') {
-                            var titleId = '_' + module.get.id() + 'title';
+                            let titleId = '_' + module.get.id() + 'title';
                             $module.attr('aria-labelledby', titleId);
                             $('<div/>', { class: className.title, id: titleId }).appendTo($module);
                         }
                         if (settings.content !== '') {
-                            var descId = '_' + module.get.id() + 'desc';
+                            let descId = '_' + module.get.id() + 'desc';
                             $module.attr('aria-describedby', descId);
                             $('<div/>', { class: className.content, id: descId }).appendTo($module);
                         }
@@ -207,13 +201,11 @@
                         element = $module[0];
                     },
                     dimmer: function () {
-                        var
-                            defaultSettings = {
-                                debug: settings.debug,
-                                dimmerName: 'modals',
-                            },
-                            dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings)
-                        ;
+                        let defaultSettings = {
+                            debug: settings.debug,
+                            dimmerName: 'modals',
+                        };
+                        let dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings);
                         if ($.fn.dimmer === undefined) {
                             module.error(error.dimmer);
 
@@ -249,8 +241,7 @@
                     module.verbose('Destroying previous modal');
                     $module
                         .removeData(moduleNamespace)
-                        .off(eventNamespace)
-                    ;
+                        .off(eventNamespace);
                     $window.off(elementEventNamespace);
                     $context.off(elementEventNamespace);
                     $dimmer.off(elementEventNamespace);
@@ -262,59 +253,56 @@
                 },
 
                 observeChanges: function () {
-                    if ('MutationObserver' in window) {
-                        observer = new MutationObserver(function (mutations) {
-                            var collectNodes = function (parent) {
-                                    var nodes = [];
-                                    for (var c = 0, cl = parent.length; c < cl; c++) {
-                                        Array.prototype.push.apply(nodes, collectNodes(parent[c].childNodes));
-                                        nodes.push(parent[c]);
-                                    }
+                    observer = new MutationObserver(function (mutations) {
+                        let collectNodes = function (parent) {
+                            let nodes = [];
+                            for (let c = 0, cl = parent.length; c < cl; c++) {
+                                Array.prototype.push.apply(nodes, collectNodes(parent[c].childNodes));
+                                nodes.push(parent[c]);
+                            }
 
-                                    return nodes;
-                                },
-                                shouldRefresh = false,
-                                shouldRefreshInputs = false,
-                                ignoreAutofocus = true
-                            ;
-                            mutations.every(function (mutation) {
-                                if (mutation.type === 'attributes') {
-                                    if (observeAttributes && (mutation.attributeName === 'disabled' || $(mutation.target).find(':input').addBack(':input').filter(':visible').length > 0)) {
-                                        shouldRefreshInputs = true;
-                                    }
-                                } else {
-                                    shouldRefresh = true;
-                                    // mutationobserver only provides the parent nodes,
-                                    // so let's collect all childs as well to find nested inputs
-                                    var $addedInputs = $(collectNodes(mutation.addedNodes)).filter('a[href], [tabindex], :input:enabled').filter(':visible'),
-                                        $removedInputs = $(collectNodes(mutation.removedNodes)).filter('a[href], [tabindex], :input');
-                                    if ($addedInputs.length > 0 || $removedInputs.length > 0) {
-                                        shouldRefreshInputs = true;
-                                        if ($addedInputs.filter(':input').length > 0 || $removedInputs.filter(':input').length > 0) {
-                                            ignoreAutofocus = false;
-                                        }
+                            return nodes;
+                        };
+                        let shouldRefresh = false;
+                        let shouldRefreshInputs = false;
+                        let ignoreAutofocus = true;
+                        mutations.every(function (mutation) {
+                            if (mutation.type === 'attributes') {
+                                if (observeAttributes && (mutation.attributeName === 'disabled' || $(mutation.target).find(':input').addBack(':input').filter(':visible').length > 0)) {
+                                    shouldRefreshInputs = true;
+                                }
+                            } else {
+                                shouldRefresh = true;
+                                // mutationobserver only provides the parent nodes,
+                                // so let's collect all childs as well to find nested inputs
+                                let $addedInputs = $(collectNodes(mutation.addedNodes)).filter('a[href], [tabindex], :input:enabled').filter(':visible');
+                                let $removedInputs = $(collectNodes(mutation.removedNodes)).filter('a[href], [tabindex], :input');
+                                if ($addedInputs.length > 0 || $removedInputs.length > 0) {
+                                    shouldRefreshInputs = true;
+                                    if ($addedInputs.filter(':input').length > 0 || $removedInputs.filter(':input').length > 0) {
+                                        ignoreAutofocus = false;
                                     }
                                 }
-
-                                return !shouldRefreshInputs;
-                            });
-
-                            if (shouldRefresh && settings.observeChanges) {
-                                module.debug('DOM tree modified, refreshing');
-                                module.refresh();
-                            }
-                            if (shouldRefreshInputs) {
-                                module.refreshInputs(ignoreAutofocus);
                             }
+
+                            return !shouldRefreshInputs;
                         });
-                        observer.observe(element, {
-                            attributeFilter: ['class', 'disabled'],
-                            attributes: true,
-                            childList: true,
-                            subtree: true,
-                        });
-                        module.debug('Setting up mutation observer', observer);
-                    }
+
+                        if (shouldRefresh && settings.observeChanges) {
+                            module.debug('DOM tree modified, refreshing');
+                            module.refresh();
+                        }
+                        if (shouldRefreshInputs) {
+                            module.refreshInputs(ignoreAutofocus);
+                        }
+                    });
+                    observer.observe(element, {
+                        attributeFilter: ['class', 'disabled'],
+                        attributes: true,
+                        childList: true,
+                        subtree: true,
+                    });
+                    module.debug('Setting up mutation observer', observer);
                 },
 
                 refresh: function () {
@@ -335,8 +323,7 @@
                 refreshInputs: function (ignoreAutofocus) {
                     if ($inputs) {
                         $inputs
-                            .off('keydown' + elementEventNamespace)
-                        ;
+                            .off('keydown' + elementEventNamespace);
                     }
                     $inputs = $module.find('a[href], [tabindex], :input:enabled').filter(':visible').filter(function () {
                         return $(this).closest('.disabled').length === 0;
@@ -348,20 +335,16 @@
                         $module.removeAttr('tabindex');
                     }
                     $inputs.first()
-                        .on('keydown' + elementEventNamespace, module.event.inputKeyDown.first)
-                    ;
+                        .on('keydown' + elementEventNamespace, module.event.inputKeyDown.first);
                     $inputs.last()
-                        .on('keydown' + elementEventNamespace, module.event.inputKeyDown.last)
-                    ;
+                        .on('keydown' + elementEventNamespace, module.event.inputKeyDown.last);
                     if (!ignoreAutofocus && settings.autofocus && $inputs.filter(':focus').length === 0) {
                         module.set.autofocus();
                     }
                 },
 
                 attachEvents: function (selector, event) {
-                    var
-                        $toggle = $(selector)
-                    ;
+                    let $toggle = $(selector);
                     event = isFunction(module[event])
                         ? module[event]
                         : module.toggle;
@@ -369,8 +352,7 @@
                         module.debug('Attaching modal events to element', selector, event);
                         $toggle
                             .off(eventNamespace)
-                            .on('click' + eventNamespace, event)
-                        ;
+                            .on('click' + eventNamespace, event);
                     } else {
                         module.error(error.notFound, selector);
                     }
@@ -382,18 +364,14 @@
                         $module
                             .on('click' + eventNamespace, selector.close, module.event.close)
                             .on('click' + eventNamespace, selector.approve, module.event.approve)
-                            .on('click' + eventNamespace, selector.deny, module.event.deny)
-                        ;
+                            .on('click' + eventNamespace, selector.deny, module.event.deny);
                         $closeIcon
-                            .on('keyup' + elementEventNamespace, module.event.closeKeyUp)
-                        ;
+                            .on('keyup' + elementEventNamespace, module.event.closeKeyUp);
                         $window
                             .on('resize' + elementEventNamespace, module.event.resize)
-                            .on('focus' + elementEventNamespace, module.event.focus)
-                        ;
+                            .on('focus' + elementEventNamespace, module.event.focus);
                         $context
-                            .on('click' + elementEventNamespace, module.event.click)
-                        ;
+                            .on('click' + elementEventNamespace, module.event.click);
                     },
                     scrollLock: function () {
                         // touch events default to passive, due to changes in chrome to optimize mobile perf
@@ -451,27 +429,21 @@
                         module.hide();
                     },
                     closeKeyUp: function (event) {
-                        var
-                            keyCode   = event.which
-                        ;
+                        let keyCode = event.which;
                         if ((keyCode === settings.keys.enter || keyCode === settings.keys.space) && $module.hasClass(className.front)) {
                             module.hide();
                         }
                     },
                     inputKeyDown: {
                         first: function (event) {
-                            var
-                                keyCode = event.which
-                            ;
+                            let keyCode = event.which;
                             if (keyCode === settings.keys.tab && event.shiftKey) {
                                 $inputs.last().trigger('focus');
                                 event.preventDefault();
                             }
                         },
                         last: function (event) {
-                            var
-                                keyCode = event.which
-                            ;
+                            let keyCode = event.which;
                             if (keyCode === settings.keys.tab && !event.shiftKey) {
                                 $inputs.first().trigger('focus');
                                 event.preventDefault();
@@ -479,10 +451,8 @@
                         },
                     },
                     mousedown: function (event) {
-                        var
-                            $target   = $(event.target),
-                            isRtl = module.is.rtl()
-                        ;
+                        let $target = $(event.target);
+                        let isRtl = module.is.rtl();
                         initialMouseDownInModal = $target.closest(selector.modal).length > 0;
                         if (initialMouseDownInModal) {
                             module.verbose('Mouse down event registered inside the modal');
@@ -508,11 +478,9 @@
 
                             return;
                         }
-                        var
-                            $target   = $(event.target),
-                            isInModal = $target.closest(selector.modal).length > 0,
-                            isInDOM   = $.contains(document.documentElement, event.target)
-                        ;
+                        let $target = $(event.target);
+                        let isInModal = $target.closest(selector.modal).length > 0;
+                        let isInDOM = $.contains(document.documentElement, event.target);
                         if (!isInModal && isInDOM && module.is.active() && $module.hasClass(className.front)) {
                             module.debug('Dimmer clicked, hiding all modals');
                             if (settings.allowMultiple) {
@@ -532,9 +500,7 @@
                         }, delay);
                     },
                     keyboard: function (event) {
-                        var
-                            keyCode   = event.which
-                        ;
+                        let keyCode = event.which;
                         if (keyCode === settings.keys.escape) {
                             if (settings.closable) {
                                 module.debug('Escape key pressed hiding modal');
@@ -654,8 +620,7 @@
                                             requestAnimationFrame(module.set.observeAttributes);
                                             callback();
                                         },
-                                    })
-                                ;
+                                    });
                             } else {
                                 module.error(error.noTransition);
                             }
@@ -666,9 +631,7 @@
                 },
 
                 hideModal: function (callback, keepDimmed, hideOthersToo) {
-                    var
-                        $previousModal = $otherModals.filter('.' + className.active).last()
-                    ;
+                    let $previousModal = $otherModals.filter('.' + className.active).last();
                     callback = isFunction(callback)
                         ? callback
                         : function () {};
@@ -719,8 +682,7 @@
                                         module.restore.focus();
                                         callback();
                                     },
-                                })
-                            ;
+                                });
                         } else {
                             module.error(error.noTransition);
                         }
@@ -758,15 +720,13 @@
                 },
 
                 hideAll: function (callback) {
-                    var
-                        $visibleModals = $allModals.filter('.' + className.active + ', .' + className.animating)
-                    ;
+                    let $visibleModals = $allModals.filter('.' + className.active + ', .' + className.animating);
                     callback = isFunction(callback)
                         ? callback
                         : function () {};
                     if ($visibleModals.length > 0) {
                         module.debug('Hiding all visible modals');
-                        var hideOk = true;
+                        let hideOk = true;
                         // check in reverse order trying to hide most top displayed modal first
                         $($visibleModals.get().reverse()).each(function (index, element) {
                             if (hideOk) {
@@ -782,17 +742,14 @@
                 },
 
                 hideOthers: function (callback) {
-                    var
-                        $visibleModals = $otherModals.filter('.' + className.active + ', .' + className.animating)
-                    ;
+                    let $visibleModals = $otherModals.filter('.' + className.active + ', .' + className.animating);
                     callback = isFunction(callback)
                         ? callback
                         : function () {};
                     if ($visibleModals.length > 0) {
                         module.debug('Hiding other modals', $otherModals);
                         $visibleModals
-                            .modal('hide modal', callback, true)
-                        ;
+                            .modal('hide modal', callback, true);
                     }
                 },
 
@@ -809,28 +766,23 @@
                     keyboardShortcuts: function () {
                         module.verbose('Adding keyboard shortcuts');
                         $document
-                            .on('keydown' + eventNamespace, module.event.keyboard)
-                        ;
+                            .on('keydown' + eventNamespace, module.event.keyboard);
                     },
                 },
 
                 save: {
                     focus: function () {
-                        var
-                            $activeElement = $(document.activeElement),
-                            inCurrentModal = $activeElement.closest($module).length > 0
-                        ;
+                        let $activeElement = $(document.activeElement);
+                        let inCurrentModal = $activeElement.closest($module).length > 0;
                         if (!inCurrentModal) {
                             $focusedElement = $(document.activeElement).trigger('blur');
                         }
                     },
                     bodyMargin: function () {
                         initialBodyMargin = $context.css((isBody ? 'margin-' : 'padding-') + (module.can.leftBodyScrollbar() ? 'left' : 'right'));
-                        var
-                            bodyMarginRightPixel = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10),
-                            bodyScrollbarWidth = isBody ? window.innerWidth - document.documentElement.clientWidth : $context[0].offsetWidth - $context[0].clientWidth
-                        ;
-                        tempBodyMargin = bodyMarginRightPixel + bodyScrollbarWidth;
+                        initialBodyMarginInt = parseInt(initialBodyMargin.replace(/[^\d.]/g, ''), 10);
+                        let bodyScrollbarWidth = isBody ? window.innerWidth - document.documentElement.clientWidth : $context[0].offsetWidth - $context[0].clientWidth;
+                        tempBodyMargin = initialBodyMarginInt + bodyScrollbarWidth;
                     },
                 },
 
@@ -841,13 +793,11 @@
                         }
                     },
                     bodyMargin: function () {
-                        var position = module.can.leftBodyScrollbar() ? 'left' : 'right';
-                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMargin);
+                        let position = module.can.leftBodyScrollbar() ? 'left' : 'right';
+                        $context.css((isBody ? 'margin-' : 'padding-') + position, initialBodyMarginInt === 0 ? '' : initialBodyMargin);
                         $context.find(selector.bodyFixed.replace('right', position)).each(function () {
-                            var
-                                el = $(this),
-                                attribute = el.css('position') === 'fixed' ? 'padding-' + position : position
-                            ;
+                            let el = $(this);
+                            let attribute = el.css('position') === 'fixed' ? 'padding-' + position : position;
                             el.css(attribute, '');
                         });
                     },
@@ -863,15 +813,12 @@
                     clickaway: function () {
                         if (!settings.detachable) {
                             $module
-                                .off('mousedown' + elementEventNamespace)
-                            ;
+                                .off('mousedown' + elementEventNamespace);
                         }
                         $dimmer
-                            .off('mousedown' + elementEventNamespace)
-                        ;
+                            .off('mousedown' + elementEventNamespace);
                         $dimmer
-                            .off('mouseup' + elementEventNamespace)
-                        ;
+                            .off('mouseup' + elementEventNamespace);
                     },
                     dimmerStyles: function () {
                         $dimmer.removeClass(className.inverted);
@@ -886,15 +833,13 @@
                     screenHeight: function () {
                         module.debug('Removing page height');
                         $context
-                            .css('height', '')
-                        ;
+                            .css('height', '');
                         module.remove.bodyStyle();
                     },
                     keyboardShortcuts: function () {
                         module.verbose('Removing keyboard shortcuts');
                         $document
-                            .off('keydown' + eventNamespace)
-                        ;
+                            .off('keydown' + eventNamespace);
                     },
                     scrolling: function () {
                         if (!keepScrollingClass) {
@@ -906,11 +851,9 @@
 
                 cacheSizes: function () {
                     $module.addClass(className.loading);
-                    var
-                        scrollHeight = $module.prop('scrollHeight'),
-                        modalWidth   = $module.outerWidth(),
-                        modalHeight  = $module.outerHeight()
-                    ;
+                    let scrollHeight = $module.prop('scrollHeight');
+                    let modalWidth = $module.outerWidth();
+                    let modalHeight = $module.outerHeight();
                     if (module.cache.pageHeight === undefined || modalHeight !== 0) {
                         $.extend(module.cache, {
                             pageHeight: $document.outerHeight(),
@@ -927,34 +870,20 @@
                     module.debug('Caching modal and container sizes', module.cache);
                 },
                 helpers: {
-                    deQuote: function (string) {
-                        return String(string).replace(/"/g, '');
-                    },
-                    escape: function (string, preserveHTML) {
-                        if (preserveHTML) {
+                    escape: function (string, settings) {
+                        if (settings !== undefined && settings.preserveHTML) {
                             return string;
                         }
-                        var
-                            badChars     = /["'<>`]/g,
-                            shouldEscape = /["&'<>`]/,
-                            escape       = {
-                                '<': '&lt;',
-                                '>': '&gt;',
-                                '"': '&quot;',
-                                "'": '&#x27;',
-                                '`': '&#x60;',
-                            },
-                            escapedChar  = function (chr) {
-                                return escape[chr];
-                            }
-                        ;
-                        if (shouldEscape.test(string)) {
-                            string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
 
-                            return string.replace(badChars, escapedChar);
-                        }
+                        const escapeMap = {
+                            '"': '&quot;',
+                            '&': '&amp;',
+                            "'": '&apos;',
+                            '<': '&lt;',
+                            '>': '&gt;',
+                        };
 
-                        return string;
+                        return String(string).replace(/["&'<>]/g, (chr) => escapeMap[chr]);
                     },
                 },
                 can: {
@@ -976,15 +905,13 @@
                         return settings.useFlex;
                     },
                     fit: function () {
-                        var
-                            contextHeight  = module.cache.contextHeight,
-                            verticalCenter = module.cache.contextHeight / 2,
-                            topOffset      = module.cache.topOffset,
-                            scrollHeight   = module.cache.scrollHeight,
-                            height         = module.cache.height,
-                            paddingHeight  = settings.padding,
-                            startPosition  = verticalCenter + topOffset
-                        ;
+                        let contextHeight = module.cache.contextHeight;
+                        let verticalCenter = module.cache.contextHeight / 2;
+                        let topOffset = module.cache.topOffset;
+                        let scrollHeight = module.cache.scrollHeight;
+                        let height = module.cache.height;
+                        let paddingHeight = settings.padding;
+                        let startPosition = verticalCenter + topOffset;
 
                         return scrollHeight > height
                             ? startPosition + scrollHeight + paddingHeight < contextHeight
@@ -1040,43 +967,36 @@
                         observeAttributes = state !== false;
                     },
                     autofocus: function () {
-                        var
-                            $autofocus = $inputs.filter('[autofocus]'),
-                            $rawInputs = $inputs.filter(':input'),
-                            $input     = ($autofocus.length > 0
-                                ? $autofocus
-                                : ($rawInputs.length > 0
-                                    ? $rawInputs
-                                    : $module)
-                            ).first()
-                        ;
+                        let $autofocus = $inputs.filter('[autofocus]');
+                        let $rawInputs = $inputs.filter(':input');
+                        let $input = ($autofocus.length > 0
+                            ? $autofocus
+                            : ($rawInputs.length > 0
+                                ? $rawInputs
+                                : $module)
+                        ).first();
                         $input.trigger('focus');
                     },
                     bodyMargin: function () {
-                        var position = module.can.leftBodyScrollbar() ? 'left' : 'right';
+                        let position = module.can.leftBodyScrollbar() ? 'left' : 'right';
                         if (settings.detachable || module.can.fit()) {
                             $context.css((isBody ? 'margin-' : 'padding-') + position, tempBodyMargin + 'px');
                         }
                         $context.find(selector.bodyFixed.replace('right', position)).each(function () {
-                            var
-                                el = $(this),
-                                attribute = el.css('position') === 'fixed' ? 'padding-' + position : position
-                            ;
+                            let el = $(this);
+                            let attribute = el.css('position') === 'fixed' ? 'padding-' + position : position;
                             el.css(attribute, 'calc(' + el.css(attribute) + ' + ' + tempBodyMargin + 'px)');
                         });
                     },
                     clickaway: function () {
                         if (!settings.detachable) {
                             $module
-                                .on('mousedown' + elementEventNamespace, module.event.mousedown)
-                            ;
+                                .on('mousedown' + elementEventNamespace, module.event.mousedown);
                         }
                         $dimmer
-                            .on('mousedown' + elementEventNamespace, module.event.mousedown)
-                        ;
+                            .on('mousedown' + elementEventNamespace, module.event.mousedown);
                         $dimmer
-                            .on('mouseup' + elementEventNamespace, module.event.mouseup)
-                        ;
+                            .on('mouseup' + elementEventNamespace, module.event.mouseup);
                     },
                     dimmerSettings: function () {
                         if ($.fn.dimmer === undefined) {
@@ -1084,19 +1004,17 @@
 
                             return;
                         }
-                        var
-                            defaultSettings = {
-                                debug: settings.debug,
-                                dimmerName: 'modals',
-                                closable: 'auto',
-                                useFlex: module.can.useFlex(),
-                                duration: {
-                                    show: settings.transition.showDuration || settings.duration,
-                                    hide: settings.transition.hideDuration || settings.duration,
-                                },
+                        let defaultSettings = {
+                            debug: settings.debug,
+                            dimmerName: 'modals',
+                            closable: 'auto',
+                            useFlex: module.can.useFlex(),
+                            duration: {
+                                show: settings.transition.showDuration || settings.duration,
+                                hide: settings.transition.hideDuration || settings.duration,
                             },
-                            dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings)
-                        ;
+                        };
+                        let dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings);
                         if (settings.inverted) {
                             dimmerSettings.variation = dimmerSettings.variation !== undefined
                                 ? dimmerSettings.variation + ' inverted'
@@ -1118,7 +1036,7 @@
                     },
                     modalOffset: function () {
                         if (!settings.detachable) {
-                            var canFit = module.can.fit();
+                            let canFit = module.can.fit();
                             $module
                                 .css({
                                     top: !$module.hasClass('aligned') && canFit
@@ -1127,8 +1045,7 @@
                                             ? $document.scrollTop() + settings.padding
                                             : $document.scrollTop() + (module.cache.contextHeight - module.cache.height - settings.padding)),
                                     marginLeft: -(module.cache.width / 2),
-                                })
-                            ;
+                                });
                         } else {
                             $module
                                 .css({
@@ -1136,8 +1053,7 @@
                                         ? -(module.cache.height / 2)
                                         : settings.padding / 2,
                                     marginLeft: -(module.cache.width / 2),
-                                })
-                            ;
+                                });
                         }
                         module.verbose('Setting modal offset for legacy mode');
                     },
@@ -1147,8 +1063,7 @@
                         } else if (!$module.hasClass('bottom')) {
                             module.debug('Modal is taller than page content, resizing page height');
                             $context
-                                .css('height', module.cache.height + (settings.padding * 2) + 'px')
-                            ;
+                                .css('height', module.cache.height + (settings.padding * 2) + 'px');
                         }
                     },
                     active: function () {
@@ -1233,11 +1148,9 @@
                 },
                 performance: {
                     log: function (message) {
-                        var
-                            currentTime,
-                            executionTime,
-                            previousTime
-                        ;
+                        let currentTime;
+                        let executionTime;
+                        let previousTime;
                         if (settings.performance) {
                             currentTime = Date.now();
                             previousTime = time || currentTime;
@@ -1256,10 +1169,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) {
@@ -1281,19 +1192,17 @@
                     },
                 },
                 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;
                             if ($.isPlainObject(object[camelCaseValue]) && (depth !== maxDepth)) {
@@ -1508,7 +1417,7 @@
 
     $.fn.modal.settings.templates = {
         getArguments: function (args) {
-            var queryArguments = [].slice.call(args);
+            let queryArguments = [].slice.call(args);
             if ($.isPlainObject(queryArguments[0])) {
                 return $.extend({
                     handler: function () {},
@@ -1527,11 +1436,9 @@
             };
         },
         alert: function () {
-            var
-                settings = this.get.settings(),
-                args     = settings.templates.getArguments(arguments),
-                approveFn = args.handler
-            ;
+            let settings = this.get.settings();
+            let args = settings.templates.getArguments(arguments);
+            let approveFn = args.handler;
 
             return {
                 title: args.title,
@@ -1545,16 +1452,14 @@
             };
         },
         confirm: function () {
-            var
-                settings = this.get.settings(),
-                args     = settings.templates.getArguments(arguments),
-                approveFn = function () {
-                    args.handler(true);
-                },
-                denyFn = function () {
-                    args.handler(false);
-                }
-            ;
+            let settings = this.get.settings();
+            let args = settings.templates.getArguments(arguments);
+            let approveFn = function () {
+                args.handler(true);
+            };
+            let denyFn = function () {
+                args.handler(false);
+            };
 
             return {
                 title: args.title,
@@ -1573,24 +1478,20 @@
             };
         },
         prompt: function () {
-            var
-                $this    = this,
-                settings = this.get.settings(),
-                args     = settings.templates.getArguments(arguments),
-                input    = $($.parseHTML(args.content)).filter('.ui.input'),
-                approveFn = function () {
-                    var
-                        settings = $this.get.settings(),
-                        inputField = $this.get.element().find(settings.selector.prompt)[0]
-                    ;
-                    args.handler($(inputField).val());
-                },
-                denyFn = function () {
-                    args.handler(null);
-                }
-            ;
+            let $this = this;
+            let settings = this.get.settings();
+            let args = settings.templates.getArguments(arguments);
+            let input = $($.parseHTML(args.content)).filter('.ui.input');
+            let approveFn = function () {
+                let settings = $this.get.settings();
+                let inputField = $this.get.element().find(settings.selector.prompt)[0];
+                args.handler($(inputField).val());
+            };
+            let denyFn = function () {
+                args.handler(null);
+            };
             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 {