fomantic-ui 2.9.1-beta.22 → 2.9.1-beta.24

package/src/definitions/modules/nag.js

@@ -15,7 +15,7 @@
         return typeof obj === 'function' && typeof obj.nodeType !== 'number';
     }
 
-    window = (typeof window != 'undefined' && window.Math == Math)
+    window = window !== undefined && window.Math === Math
         ? window
         : globalThis;
 
@@ -24,17 +24,17 @@
             $allModules    = $(this),
             moduleSelector = $allModules.selector || '',
 
-            time           = new Date().getTime(),
+            time           = Date.now(),
             performance    = [],
 
             query          = arguments[0],
-            methodInvoked  = (typeof query == 'string'),
+            methodInvoked  = typeof query === 'string',
             queryArguments = [].slice.call(arguments, 1),
             returnedValue
         ;
         $allModules.each(function () {
             var
-                settings          = ($.isPlainObject(parameters))
+                settings          = $.isPlainObject(parameters)
                     ? $.extend(true, {}, $.fn.nag.settings, parameters)
                     : $.extend({}, $.fn.nag.settings),
 
@@ -47,7 +47,7 @@
 
                 $module         = $(this),
 
-                $context        = (settings.context)
+                $context        = settings.context
                     ? ([window, document].indexOf(settings.context) < 0 ? $(document).find(settings.context) : $(settings.context))
                     : $('body'),
 
@@ -162,20 +162,22 @@
                         }
                         if (expires instanceof Date && expires.getTime()) {
                             return expires.toUTCString();
-                        } else {
-                            module.error(error.expiresFormat);
                         }
+
+                        module.error(error.expiresFormat);
                     },
                     storage: function () {
                         if (settings.storageMethod === 'localstorage' && window.localStorage !== undefined) {
                             module.debug('Using local storage');
 
                             return window.localStorage;
-                        } else if (settings.storageMethod === 'sessionstorage' && window.sessionStorage !== undefined) {
+                        }
+                        if (settings.storageMethod === 'sessionstorage' && window.sessionStorage !== undefined) {
                             module.debug('Using session storage');
 
                             return window.sessionStorage;
-                        } else if ('cookie' in document) {
+                        }
+                        if ('cookie' in document) {
                             module.debug('Using cookie');
 
                             return {
@@ -186,12 +188,12 @@
                                         .replace(/[()]/g, escape)
                                     ;
                                     value = encodeURIComponent(value)
-                                        .replace(/%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g, decodeURIComponent)
+                                        .replace(/%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[B-D])/g, decodeURIComponent)
                                     ;
 
                                     var cookieOptions = '';
                                     for (var option in options) {
-                                        if (options.hasOwnProperty(option)) {
+                                        if (Object.prototype.hasOwnProperty.call(options, option)) {
                                             cookieOptions += '; ' + option;
                                             if (typeof options[option] === 'string') {
                                                 cookieOptions += '=' + options[option].split(';')[0];
@@ -205,7 +207,7 @@
                                     for (var i = 0, il = cookies.length; i < il; i++) {
                                         var
                                             parts    = cookies[i].split('='),
-                                            foundKey = parts[0].replace(/(%[\dA-F]{2})+/gi, decodeURIComponent)
+                                            foundKey = parts[0].replace(/(%[\da-f]{2})+/gi, decodeURIComponent)
                                         ;
                                         if (key === foundKey) {
                                             return parts[1] || '';
@@ -216,9 +218,9 @@
                                     storage.setItem(key, '', options);
                                 },
                             };
-                        } else {
-                            module.error(error.noStorage);
                         }
+
+                        module.error(error.noStorage);
                     },
                     storageOptions: function () {
                         var
@@ -352,7 +354,7 @@
                             previousTime
                         ;
                         if (settings.performance) {
-                            currentTime = new Date().getTime();
+                            currentTime = Date.now();
                             previousTime = time || currentTime;
                             executionTime = currentTime - previousTime;
                             time = currentTime;
@@ -403,11 +405,11 @@
                     ;
                     passedArguments = passedArguments || queryArguments;
                     context = context || element;
-                    if (typeof query == 'string' && object !== undefined) {
-                        query = query.split(/[\. ]/);
+                    if (typeof query === 'string' && object !== undefined) {
+                        query = query.split(/[ .]/);
                         maxDepth = query.length - 1;
                         $.each(query, function (depth, value) {
-                            var camelCaseValue = (depth != maxDepth)
+                            var camelCaseValue = depth != maxDepth
                                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
                                 : query
                             ;
@@ -460,7 +462,7 @@
             }
         });
 
-        return (returnedValue !== undefined)
+        return returnedValue !== undefined
             ? returnedValue
             : this;
     };

package/src/definitions/modules/popup.js

@@ -15,7 +15,7 @@
         return typeof obj === 'function' && typeof obj.nodeType !== 'number';
     }
 
-    window = (typeof window != 'undefined' && window.Math == Math)
+    window = window !== undefined && window.Math === Math
         ? window
         : globalThis;
 
@@ -28,22 +28,22 @@
 
             moduleSelector = $allModules.selector || '',
 
-            clickEvent      = ('ontouchstart' in document.documentElement)
+            clickEvent      = 'ontouchstart' in document.documentElement
                 ? 'touchstart'
                 : 'click',
 
-            time           = new Date().getTime(),
+            time           = Date.now(),
             performance    = [],
 
             query          = arguments[0],
-            methodInvoked  = (typeof query == 'string'),
+            methodInvoked  = typeof query === 'string',
             queryArguments = [].slice.call(arguments, 1),
 
             returnedValue
         ;
         $allModules.each(function () {
             var
-                settings        = ($.isPlainObject(parameters))
+                settings        = $.isPlainObject(parameters)
                     ? $.extend(true, {}, $.fn.popup.settings, parameters)
                     : $.extend({}, $.fn.popup.settings),
 
@@ -60,7 +60,7 @@
                 $context           = [window, document].indexOf(settings.context) < 0 ? $document.find(settings.context) : $(settings.context),
                 $scrollContext     = [window, document].indexOf(settings.scrollContext) < 0 ? $document.find(settings.scrollContext) : $(settings.scrollContext),
                 $boundary          = [window, document].indexOf(settings.boundary) < 0 ? $document.find(settings.boundary) : $(settings.boundary),
-                $target            = (settings.target)
+                $target            = settings.target
                     ? ([window, document].indexOf(settings.target) < 0 ? $document.find(settings.target) : $(settings.target))
                     : $module,
 
@@ -136,11 +136,11 @@
                             ;
                         }
                     } else {
-                        $offsetParent = (settings.inline)
+                        $offsetParent = settings.inline
                             ? module.get.offsetParent($target)
-                            : module.has.popup()
+                            : (module.has.popup()
                                 ? module.get.offsetParent($popup)
-                                : $body;
+                                : $body);
                     }
                     if ($offsetParent.is('html') && $offsetParent[0] !== $body[0]) {
                         module.debug('Setting page as offset parent');
@@ -179,7 +179,7 @@
                 event: {
                     start: function (event) {
                         var
-                            delay = ($.isPlainObject(settings.delay))
+                            delay = $.isPlainObject(settings.delay)
                                 ? settings.delay.show
                                 : settings.delay
                         ;
@@ -190,7 +190,7 @@
                     },
                     end: function () {
                         var
-                            delay = ($.isPlainObject(settings.delay))
+                            delay = $.isPlainObject(settings.delay)
                                 ? settings.delay.hide
                                 : settings.delay
                         ;
@@ -224,7 +224,7 @@
                         var
                             $target = $(event.target),
                             isInDOM = $.contains(document.documentElement, event.target),
-                            inPopup = ($target.closest(selector.popup).length > 0)
+                            inPopup = $target.closest(selector.popup).length > 0
                         ;
                         // don't close on clicks inside popup
                         if (event && !inPopup && isInDOM) {
@@ -282,7 +282,7 @@
                         if (settings.hoverable) {
                             module.bind.popup();
                         }
-                    } else if ($target.next(selector.popup).length !== 0) {
+                    } else if ($target.next(selector.popup).length > 0) {
                         module.verbose('Pre-existing popup found');
                         settings.inline = true;
                         settings.popup = $target.next(selector.popup).data(metadata.activator, $module);
@@ -325,7 +325,8 @@
                             module.debug('onShow callback returned false, cancelling popup animation');
 
                             return;
-                        } else if (!settings.preserve && !settings.popup) {
+                        }
+                        if (!settings.preserve && !settings.popup) {
                             module.refresh();
                         }
                         if ($popup && module.set.position()) {
@@ -369,12 +370,10 @@
                         return false;
                     }
                     if (settings.inline || settings.popup) {
-                        return (module.has.popup());
-                    } else {
-                        return ($popup.closest($context).length >= 1)
-                            ? true
-                            : false;
+                        return module.has.popup();
                     }
+
+                    return $popup.closest($context).length > 0;
                 },
 
                 removePopup: function () {
@@ -409,7 +408,7 @@
                 },
                 supports: {
                     svg: function () {
-                        return (typeof SVGGraphicsElement !== 'undefined');
+                        return typeof SVGGraphicsElement !== 'undefined';
                     },
                 },
                 animate: {
@@ -498,16 +497,16 @@
                         var
                             $popupOffsetParent = module.get.offsetParent($popup),
                             targetElement      = $target[0],
-                            isWindowEl         = ($boundary[0] == window),
+                            isWindowEl         = $boundary[0] == window,
                             targetOffset       = $target.offset(),
                             parentOffset       = settings.inline || (settings.popup && settings.movePopup)
                                 ? $target.offsetParent().offset()
                                 : { top: 0, left: 0 },
-                            screenPosition = (isWindowEl)
+                            screenPosition = isWindowEl
                                 ? { top: 0, left: 0 }
                                 : $boundary.offset(),
                             calculations   = {},
-                            scroll = (isWindowEl)
+                            scroll = isWindowEl
                                 ? { top: $window.scrollTop(), left: $window.scrollLeft() }
                                 : { top: 0, left: 0 },
                             screen
@@ -565,13 +564,13 @@
                         }
 
                         // add in margins if inline
-                        calculations.target.margin.top = (settings.inline)
+                        calculations.target.margin.top = settings.inline
                             ? parseInt(window.getComputedStyle(targetElement).getPropertyValue('margin-top'), 10)
                             : 0;
-                        calculations.target.margin.left = (settings.inline)
-                            ? module.is.rtl()
+                        calculations.target.margin.left = settings.inline
+                            ? (module.is.rtl()
                                 ? parseInt(window.getComputedStyle(targetElement).getPropertyValue('margin-right'), 10)
-                                : parseInt(window.getComputedStyle(targetElement).getPropertyValue('margin-left'), 10)
+                                : parseInt(window.getComputedStyle(targetElement).getPropertyValue('margin-left'), 10))
                             : 0;
                         // calculate screen boundaries
                         screen = calculations.screen;
@@ -590,7 +589,8 @@
                     startEvent: function () {
                         if (settings.on == 'hover') {
                             return 'mouseenter';
-                        } else if (settings.on == 'focus') {
+                        }
+                        if (settings.on == 'focus') {
                             return 'focus';
                         }
 
@@ -602,7 +602,8 @@
                     endEvent: function () {
                         if (settings.on == 'hover') {
                             return 'mouseleave';
-                        } else if (settings.on == 'focus') {
+                        }
+                        if (settings.on == 'focus') {
                             return 'blur';
                         }
 
@@ -622,10 +623,10 @@
 
                         if (offset) {
                             distanceFromBoundary = {
-                                top: (offset.top - boundary.top),
-                                left: (offset.left - boundary.left),
-                                right: (boundary.right - (offset.left + popup.width)),
-                                bottom: (boundary.bottom - (offset.top + popup.height)),
+                                top: offset.top - boundary.top,
+                                left: offset.left - boundary.left,
+                                right: boundary.right - (offset.left + popup.width),
+                                bottom: boundary.bottom - (offset.top + popup.height),
                             };
                             module.verbose('Distance from boundaries determined', offset, distanceFromBoundary);
                         }
@@ -634,7 +635,7 @@
                     },
                     offsetParent: function ($element) {
                         var
-                            element = ($element !== undefined)
+                            element = $element !== undefined
                                 ? $element[0]
                                 : $target[0],
                             parentNode = element.parentNode,
@@ -642,20 +643,20 @@
                         ;
                         if (parentNode) {
                             var
-                                is2D     = ($node.css('transform') === 'none'),
-                                isStatic = ($node.css('position') === 'static'),
+                                is2D     = $node.css('transform') === 'none',
+                                isStatic = $node.css('position') === 'static',
                                 isBody   = $node.is('body')
                             ;
                             while (parentNode && !isBody && isStatic && is2D) {
                                 parentNode = parentNode.parentNode;
                                 $node = $(parentNode);
-                                is2D = ($node.css('transform') === 'none');
-                                isStatic = ($node.css('position') === 'static');
+                                is2D = $node.css('transform') === 'none';
+                                isStatic = $node.css('position') === 'static';
                                 isBody = $node.is('body');
                             }
                         }
 
-                        return ($node && $node.length > 0)
+                        return $node && $node.length > 0
                             ? $node
                             : $();
                     },
@@ -697,7 +698,7 @@
                                 'bottom left': 'left center',
                                 'left center': 'top left',
                             },
-                            adjacentsAvailable = (verticalPosition == 'top' || verticalPosition == 'bottom'),
+                            adjacentsAvailable = verticalPosition == 'top' || verticalPosition == 'bottom',
                             oppositeTried = false,
                             adjacentTried = false,
                             nextPosition  = false
@@ -713,13 +714,13 @@
                         if (settings.prefer === 'opposite') {
                             nextPosition = [opposite[verticalPosition], horizontalPosition];
                             nextPosition = nextPosition.join(' ');
-                            oppositeTried = (triedPositions[nextPosition] === true);
+                            oppositeTried = triedPositions[nextPosition] === true;
                             module.debug('Trying opposite strategy', nextPosition);
                         }
                         if ((settings.prefer === 'adjacent') && adjacentsAvailable) {
                             nextPosition = [verticalPosition, adjacent[horizontalPosition]];
                             nextPosition = nextPosition.join(' ');
-                            adjacentTried = (triedPositions[nextPosition] === true);
+                            adjacentTried = triedPositions[nextPosition] === true;
                             module.debug('Trying adjacent strategy', nextPosition);
                         }
                         if (adjacentTried || oppositeTried) {
@@ -764,11 +765,11 @@
                         if (module.should.centerArrow(calculations)) {
                             module.verbose('Adjusting offset to center arrow on small target element');
                             if (position == 'top left' || position == 'bottom left') {
-                                offset += (target.width / 2);
+                                offset += target.width / 2;
                                 offset -= settings.arrowPixelsFromEdge;
                             }
                             if (position == 'top right' || position == 'bottom right') {
-                                offset -= (target.width / 2);
+                                offset -= target.width / 2;
                                 offset += settings.arrowPixelsFromEdge;
                             }
                         }
@@ -797,7 +798,7 @@
 
                         if (module.is.rtl()) {
                             position = position.replace(/left|right/g, function (match) {
-                                return (match == 'left')
+                                return match == 'left'
                                     ? 'right'
                                     : 'left';
                             });
@@ -909,22 +910,21 @@
                                 position = module.get.nextPosition(position);
                                 module.debug('Trying new position', position);
 
-                                return ($popup)
+                                return $popup
                                     ? module.set.position(position, calculations)
                                     : false;
+                            }
+                            if (settings.lastResort) {
+                                module.debug('No position found, showing with last position');
                             } else {
-                                if (settings.lastResort) {
-                                    module.debug('No position found, showing with last position');
-                                } else {
-                                    module.debug('Popup could not find a position to display', $popup);
-                                    module.error(error.cannotPlace, element);
-                                    module.remove.attempts();
-                                    module.remove.loading();
-                                    module.reset();
-                                    settings.onUnplaceable.call($popup, element);
-
-                                    return false;
-                                }
+                                module.debug('Popup could not find a position to display', $popup);
+                                module.error(error.cannotPlace, element);
+                                module.remove.attempts();
+                                module.remove.loading();
+                                module.reset();
+                                settings.onUnplaceable.call($popup, element);
+
+                                return false;
                             }
                         }
                         module.debug('Position is on stage', position);
@@ -1067,7 +1067,7 @@
 
                 has: {
                     popup: function () {
-                        return ($popup && $popup.length > 0);
+                        return $popup && $popup.length > 0;
                     },
                 },
 
@@ -1109,13 +1109,13 @@
                         return $module.hasClass(className.active);
                     },
                     animating: function () {
-                        return ($popup !== undefined && $popup.hasClass(className.animating));
+                        return $popup !== undefined && $popup.hasClass(className.animating);
                     },
                     fluid: function () {
-                        return ($popup !== undefined && $popup.hasClass(className.fluid));
+                        return $popup !== undefined && $popup.hasClass(className.fluid);
                     },
                     visible: function () {
-                        return ($popup !== undefined && $popup.hasClass(className.popupVisible));
+                        return $popup !== undefined && $popup.hasClass(className.popupVisible);
                     },
                     dropdown: function () {
                         return $module.hasClass(className.dropdown);
@@ -1193,7 +1193,7 @@
                             previousTime
                         ;
                         if (settings.performance) {
-                            currentTime = new Date().getTime();
+                            currentTime = Date.now();
                             previousTime = time || currentTime;
                             executionTime = currentTime - previousTime;
                             time = currentTime;
@@ -1244,11 +1244,11 @@
                     ;
                     passedArguments = passedArguments || queryArguments;
                     context = context || element;
-                    if (typeof query == 'string' && object !== undefined) {
-                        query = query.split(/[\. ]/);
+                    if (typeof query === 'string' && object !== undefined) {
+                        query = query.split(/[ .]/);
                         maxDepth = query.length - 1;
                         $.each(query, function (depth, value) {
-                            var camelCaseValue = (depth != maxDepth)
+                            var camelCaseValue = depth != maxDepth
                                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
                                 : query
                             ;
@@ -1299,7 +1299,7 @@
             }
         });
 
-        return (returnedValue !== undefined)
+        return returnedValue !== undefined
             ? returnedValue
             : this;
     };
@@ -1471,8 +1471,8 @@
         templates: {
             escape: function (string) {
                 var
-                    badChars     = /[<>"'`]/g,
-                    shouldEscape = /[&<>"'`]/,
+                    badChars     = /["'<>`]/g,
+                    shouldEscape = /["&'<>`]/,
                     escape       = {
                         '<': '&lt;',
                         '>': '&gt;',
@@ -1485,7 +1485,7 @@
                     }
                 ;
                 if (shouldEscape.test(string)) {
-                    string = string.replace(/&(?![a-z0-9#]{1,12};)/gi, '&amp;');
+                    string = string.replace(/&(?![\d#a-z]{1,12};)/gi, '&amp;');
 
                     return string.replace(badChars, escapedChar);
                 }