From e248e6ecc3ef95de45ae821e9ba43a03837f3691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sat, 15 Mar 2025 02:52:05 +0100 Subject: [PATCH 01/13] CS autofix: one-var = default/never --- .eslintrc.js | 1 - changelog-setup.js | 128 ++-- gulpfile.js | 10 +- src/definitions/behaviors/api.js | 244 +++--- src/definitions/behaviors/form.js | 450 +++++------ src/definitions/behaviors/state.js | 94 +-- src/definitions/behaviors/visibility.js | 206 ++--- src/definitions/globals/site.js | 56 +- src/definitions/modules/accordion.js | 110 +-- src/definitions/modules/calendar.js | 312 ++++---- src/definitions/modules/checkbox.js | 100 +-- src/definitions/modules/dimmer.js | 74 +- src/definitions/modules/dropdown.js | 964 ++++++++++++------------ src/definitions/modules/embed.js | 102 +-- src/definitions/modules/flyout.js | 290 +++---- src/definitions/modules/modal.js | 304 ++++---- src/definitions/modules/nag.js | 88 +-- src/definitions/modules/popup.js | 260 +++---- src/definitions/modules/progress.js | 104 +-- src/definitions/modules/rating.js | 98 +-- src/definitions/modules/search.js | 338 ++++----- src/definitions/modules/shape.js | 180 ++--- src/definitions/modules/sidebar.js | 194 ++--- src/definitions/modules/slider.js | 406 +++++----- src/definitions/modules/sticky.js | 172 ++--- src/definitions/modules/tab.js | 260 +++---- src/definitions/modules/toast.js | 136 ++-- src/definitions/modules/transition.js | 110 +-- tasks/admin/components/create.js | 148 ++-- tasks/admin/components/init.js | 50 +- tasks/admin/components/update.js | 88 +-- tasks/admin/distributions/create.js | 114 +-- tasks/admin/distributions/init.js | 52 +- tasks/admin/distributions/update.js | 86 +-- tasks/admin/register.js | 18 +- tasks/build.js | 6 +- tasks/build/assets.js | 22 +- tasks/build/css.js | 82 +- tasks/build/javascript.js | 74 +- tasks/check-install.js | 8 +- tasks/clean.js | 4 +- tasks/collections/admin.js | 24 +- tasks/collections/build.js | 12 +- tasks/collections/docs.js | 4 +- tasks/collections/install.js | 4 +- tasks/collections/rtl.js | 4 +- tasks/collections/various.js | 4 +- tasks/config/admin/github.js | 14 +- tasks/config/npm/gulpfile.js | 8 +- tasks/config/project/config.js | 44 +- tasks/config/project/install.js | 48 +- tasks/config/project/release.js | 12 +- tasks/config/tasks.js | 12 +- tasks/config/user.js | 16 +- tasks/docs/build.js | 44 +- tasks/docs/metadata.js | 44 +- tasks/docs/serve.js | 32 +- tasks/install.js | 90 +-- tasks/rtl/build.js | 4 +- tasks/rtl/watch.js | 4 +- tasks/watch.js | 16 +- test/modules/module.spec.js | 26 +- 62 files changed, 3504 insertions(+), 3505 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a82afbceab..f96e2b8b0e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -93,7 +93,6 @@ module.exports = { 'no-restricted-globals': 'off', 'no-restricted-properties': 'off', 'no-var': 'off', // https://github.com/fomantic/Fomantic-UI/pull/2584 - 'one-var': 'off', 'prefer-const': 'off', 'prefer-exponentiation-operator': 'off', 'prefer-rest-params': 'off', diff --git a/changelog-setup.js b/changelog-setup.js index e53c407780..9fc589c9c7 100644 --- a/changelog-setup.js +++ b/changelog-setup.js @@ -1,8 +1,8 @@ const semver = require('semver'); // eslint-disable-line import/no-extraneous-dependencies -let changelogDeps = {}, - loopVersion = '', - uniqueCommits = [] +let changelogDeps = {}; +let loopVersion = ''; +let uniqueCommits = [] ; const issueLinks = function (item) { if (typeof loopVersion !== 'string') { @@ -114,77 +114,77 @@ module.exports = function (Handlebars) { changelogDeps = {}; const - depsRegex = /(?:build\(deps[A-Za-z-]*\):|\[Snyk]) (?:\[?[Ss]ecurity]? )?(?:bump|upgrade) ([\w./@-]+) from (\d+\.\d+\.\d+) to (\d+\.\d+\.\d+)/, - detectVersionRange = function (item) { - let subjectDetails = item.subject.match(depsRegex); - if (!subjectDetails) { - return true; - } + depsRegex = /(?:build\(deps[A-Za-z-]*\):|\[Snyk]) (?:\[?[Ss]ecurity]? )?(?:bump|upgrade) ([\w./@-]+) from (\d+\.\d+\.\d+) to (\d+\.\d+\.\d+)/; + const detectVersionRange = function (item) { + let subjectDetails = item.subject.match(depsRegex); + if (!subjectDetails) { + return true; + } - let depPackage = subjectDetails[1], - depVersionFrom = subjectDetails[2], - depVersionTo = subjectDetails[3] + let depPackage = subjectDetails[1]; + let depVersionFrom = subjectDetails[2]; + let depVersionTo = subjectDetails[3] ; - if (!changelogDeps[depPackage]) { - changelogDeps[depPackage] = { - from: '999.999.999', - to: '0.0.0', - }; - } - if (semver.lt(depVersionFrom, changelogDeps[depPackage].from)) { - changelogDeps[depPackage].from = depVersionFrom; - } - if (semver.gte(depVersionTo, changelogDeps[depPackage].to)) { - changelogDeps[depPackage].to = depVersionTo; + if (!changelogDeps[depPackage]) { + changelogDeps[depPackage] = { + from: '999.999.999', + to: '0.0.0', + }; + } + if (semver.lt(depVersionFrom, changelogDeps[depPackage].from)) { + changelogDeps[depPackage].from = depVersionFrom; + } + if (semver.gte(depVersionTo, changelogDeps[depPackage].to)) { + changelogDeps[depPackage].to = depVersionTo; - return true; - } + return true; + } - return false; - }, - list = context - .filter((item) => { - const commit = item.commit || item; - if (exclude) { - const pattern = new RegExp(exclude, 'm'); - if (pattern.test(commit.message)) { - return false; - } + return false; + }; + const list = context + .filter((item) => { + const commit = item.commit || item; + if (exclude) { + const pattern = new RegExp(exclude, 'm'); + if (pattern.test(commit.message)) { + return false; } - if (message) { - const pattern = new RegExp(message, 'm'); + } + if (message) { + const pattern = new RegExp(message, 'm'); - return pattern.test(commit.message); - } - if (subject) { - const pattern = new RegExp(subject); + return pattern.test(commit.message); + } + if (subject) { + const pattern = new RegExp(subject); - return pattern.test(commit.subject); - } + return pattern.test(commit.subject); + } - return true; - }) - .filter(detectVersionRange) - // second round as the previous list came unordered from git - .filter(detectVersionRange) - // adjust from version to create the whole range in one line (linked to the latest commit) - .map((item) => { - let subjectDetails = item.subject.match(depsRegex); - if (!subjectDetails) { - return item; - } - let - depPackage = subjectDetails[1], - depVersionFrom = subjectDetails[2] + return true; + }) + .filter(detectVersionRange) + // second round as the previous list came unordered from git + .filter(detectVersionRange) + // adjust from version to create the whole range in one line (linked to the latest commit) + .map((item) => { + let subjectDetails = item.subject.match(depsRegex); + if (!subjectDetails) { + return item; + } + let + depPackage = subjectDetails[1]; + let depVersionFrom = subjectDetails[2] ; - item.subject = item.subject.replace(depVersionFrom, changelogDeps[depPackage].from); + item.subject = item.subject.replace(depVersionFrom, changelogDeps[depPackage].from); - return item; - }) - .map(issueLinks) - .map((item) => options.fn(item)) - .sort() - .join('') + return item; + }) + .map(issueLinks) + .map((item) => options.fn(item)) + .sort() + .join('') ; if (!list) { return ''; diff --git a/gulpfile.js b/gulpfile.js index 372b1ffc42..a77dadc29f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,13 +3,13 @@ *******************************/ const - gulp = require('gulp'), + gulp = require('gulp'); - // read user config to know what task to load - config = require('./tasks/config/user'), +// read user config to know what task to load +const config = require('./tasks/config/user'); - admin = require('./tasks/collections/admin'), - rtl = require('./tasks/collections/rtl') +const admin = require('./tasks/collections/admin'); +const rtl = require('./tasks/collections/rtl') ; /******************************* diff --git a/src/definitions/behaviors/api.js b/src/definitions/behaviors/api.js index 3e029e0525..c20c1c6387 100644 --- a/src/definitions/behaviors/api.js +++ b/src/definitions/behaviors/api.js @@ -28,67 +28,67 @@ // use window context if none specified $allModules = isFunction(this) ? $(window) - : $(this), - 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 = $(context); - } else { - $context = $(win.document).find(context); - if ($context.length === 0) { - $context = win.frameElement ? contextCheck(context, win.parent) : window; - } + : $(this); + var time = Date.now(); + var performance = []; + + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var contextCheck = function (context, win) { + var $context; + if ([window, document].indexOf(context) >= 0) { + $context = $(context); + } else { + $context = $(win.document).find(context); + if ($context.length === 0) { + $context = win.frameElement ? contextCheck(context, win.parent) : window; } + } - return $context; - }, - returnedValue + return $context; + }; + var returnedValue ; $allModules.each(function () { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.api.settings, parameters) - : $.extend({}, $.fn.api.settings), - - // internal aliases - regExp = settings.regExp, - namespace = settings.namespace, - metadata = settings.metadata, - selector = settings.selector, - error = settings.error, - className = settings.className, - - // define namespaces for modules - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, - - // element that creates request - $module = $(this), - $form = $module.closest(selector.form), - - // context used for state - $context = settings.stateContext ? contextCheck(settings.stateContext, window) : $module, - - // request details - ajaxSettings, - requestSettings, - url, - data, - requestStartTime, - originalData, - - // standard module - element = this, - context = $context[0], - instance = $module.data(moduleNamespace), - module + : $.extend({}, $.fn.api.settings); + + // internal aliases + var regExp = settings.regExp; + var namespace = settings.namespace; + var metadata = settings.metadata; + var selector = settings.selector; + var error = settings.error; + var className = settings.className; + + // define namespaces for modules + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; + + // element that creates request + var $module = $(this); + var $form = $module.closest(selector.form); + + // context used for state + var $context = settings.stateContext ? contextCheck(settings.stateContext, window) : $module; + + // request details + var ajaxSettings; + var requestSettings; + var url; + var data; + var requestStartTime; + var originalData; + + // standard module + var element = this; + var context = $context[0]; + var instance = $module.data(moduleNamespace); + var module ; module = { @@ -357,8 +357,8 @@ add: { urlData: function (url, urlData) { var - requiredVariables, - optionalVariables + requiredVariables; + var optionalVariables ; if (url) { requiredVariables = url.match(regExp.required); @@ -371,14 +371,14 @@ // allow legacy {$var} style variable = templatedString.indexOf('$') !== -1 ? templatedString.slice(2, -1) - : templatedString.slice(1, -1), - value = $.isPlainObject(urlData) && urlData[variable] !== undefined - ? urlData[variable] - : ($module.data(variable) !== undefined - ? $module.data(variable) - : ($context.data(variable) !== undefined // eslint-disable-line unicorn/no-nested-ternary - ? $context.data(variable) - : urlData[variable])) + : templatedString.slice(1, -1); + var value = $.isPlainObject(urlData) && urlData[variable] !== undefined + ? urlData[variable] + : ($module.data(variable) !== undefined + ? $module.data(variable) + : ($context.data(variable) !== undefined // eslint-disable-line unicorn/no-nested-ternary + ? $context.data(variable) + : urlData[variable])) ; // remove value if (value === undefined) { @@ -402,14 +402,14 @@ // allow legacy {/$var} style variable = templatedString.indexOf('$') !== -1 ? templatedString.slice(3, -1) - : templatedString.slice(2, -1), - value = $.isPlainObject(urlData) && urlData[variable] !== undefined - ? urlData[variable] - : ($module.data(variable) !== undefined - ? $module.data(variable) - : ($context.data(variable) !== undefined // eslint-disable-line unicorn/no-nested-ternary - ? $context.data(variable) - : urlData[variable])) + : templatedString.slice(2, -1); + var value = $.isPlainObject(urlData) && urlData[variable] !== undefined + ? urlData[variable] + : ($module.data(variable) !== undefined + ? $module.data(variable) + : ($context.data(variable) !== undefined // eslint-disable-line unicorn/no-nested-ternary + ? $context.data(variable) + : urlData[variable])) ; // optional replacement if (value !== undefined) { @@ -430,9 +430,9 @@ }, formData: function (data) { var - formData = {}, - hasOtherData, - useFormDataApi = settings.serializeForm === 'formdata' + formData = {}; + var hasOtherData; + var useFormDataApi = settings.serializeForm === 'formdata' ; data = data || originalData || settings.data; hasOtherData = $.isPlainObject(data); @@ -443,14 +443,14 @@ settings.contentType = settings.contentType !== undefined ? settings.contentType : false; } else { var - formArray = $form.serializeArray(), - pushes = {}, - pushValues = {}, - build = function (base, key, value) { - base[key] = value; + formArray = $form.serializeArray(); + var pushes = {}; + var pushValues = {}; + var build = function (base, key, value) { + base[key] = value; - return base; - } + return base; + } ; // add files $.each($('input[type="file"]', $form), function (i, tag) { @@ -463,15 +463,15 @@ return; } var - isCheckbox = $('[name="' + el.name + '"]', $form).attr('type') === 'checkbox', - floatValue = parseFloat(el.value), - value = (isCheckbox && el.value === 'on') + isCheckbox = $('[name="' + el.name + '"]', $form).attr('type') === 'checkbox'; + var floatValue = parseFloat(el.value); + var value = (isCheckbox && el.value === 'on') || el.value === 'true' || (String(floatValue) === el.value ? floatValue - : (el.value === 'false' ? false : el.value)), - nameKeys = el.name.match(regExp.key) || [], - pushKey = el.name.replace(/\[]$/, '') + : (el.value === 'false' ? false : el.value)); + var nameKeys = el.name.match(regExp.key) || []; + var pushKey = el.name.replace(/\[]$/, '') ; if (!(pushKey in pushes)) { pushes[pushKey] = 0; @@ -545,14 +545,14 @@ }, done: function (response, textStatus, xhr) { var - context = this, - elapsedTime = Date.now() - requestStartTime, - timeLeft = settings.loadingDuration - elapsedTime, - translatedResponse = isFunction(settings.onResponse) - ? (module.is.expectingJSON() && !settings.rawResponse - ? settings.onResponse.call(context, $.extend(true, {}, response)) - : settings.onResponse.call(context, response)) - : false + context = this; + var elapsedTime = Date.now() - requestStartTime; + var timeLeft = settings.loadingDuration - elapsedTime; + var translatedResponse = isFunction(settings.onResponse) + ? (module.is.expectingJSON() && !settings.rawResponse + ? settings.onResponse.call(context, $.extend(true, {}, response)) + : settings.onResponse.call(context, response)) + : false ; timeLeft = timeLeft > 0 ? timeLeft @@ -574,9 +574,9 @@ }, fail: function (xhr, status, httpMessage) { var - context = this, - elapsedTime = Date.now() - requestStartTime, - timeLeft = settings.loadingDuration - elapsedTime + context = this; + var elapsedTime = Date.now() - requestStartTime; + var timeLeft = settings.loadingDuration - elapsedTime ; timeLeft = timeLeft > 0 ? timeLeft @@ -604,8 +604,8 @@ }, complete: function (firstParameter, secondParameter) { var - xhr, - response + xhr; + var response ; // have to guess callback parameters based on request success if (module.was.successful()) { @@ -621,8 +621,8 @@ fail: function (xhr, status, httpMessage) { var // pull response from xhr if available - response = module.get.responseFromXHR(xhr), - errorMessage = module.get.errorFromRequest(response, status, httpMessage) + response = module.get.responseFromXHR(xhr); + var errorMessage = module.get.errorFromRequest(response, status, httpMessage) ; if (status === 'aborted') { module.debug('XHR Aborted (Most likely caused by page navigation or CORS Policy)', status, httpMessage); @@ -672,14 +672,14 @@ mockedXHR: function () { var // xhr does not simulate these properties of xhr but must return them - textStatus = false, - status = false, - httpMessage = false, - responder = settings.mockResponse || settings.response, - asyncResponder = settings.mockResponseAsync || settings.responseAsync, - asyncCallback, - response, - mockedXHR + textStatus = false; + var status = false; + var httpMessage = false; + var responder = settings.mockResponse || settings.response; + var asyncResponder = settings.mockResponseAsync || settings.responseAsync; + var asyncCallback; + var response; + var mockedXHR ; mockedXHR = $.Deferred() @@ -813,9 +813,9 @@ }, urlEncodedValue: function (value) { var - decodedValue = window.decodeURIComponent(value), - encodedValue = window.encodeURIComponent(value), - alreadyEncoded = decodedValue !== value + decodedValue = window.decodeURIComponent(value); + var encodedValue = window.encodeURIComponent(value); + var alreadyEncoded = decodedValue !== value ; if (alreadyEncoded) { module.debug('URL value is already encoded, avoiding double encoding', value); @@ -956,9 +956,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -979,8 +979,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -1004,10 +1004,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js index 38461126f0..7fdef0a55f 100644 --- a/src/definitions/behaviors/form.js +++ b/src/definitions/behaviors/form.js @@ -21,56 +21,56 @@ $.fn.form = function (parameters) { var - $allModules = $(this), - $window = $(window), + $allModules = $(this); + var $window = $(window); - time = Date.now(), - performance = [], + var time = Date.now(); + var performance = []; - query = arguments[0], - methodInvoked = typeof query === 'string', - queryArguments = [].slice.call(arguments, 1), - returnedValue + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var returnedValue ; $allModules.each(function () { var - $module = $(this), - element = this, - - formErrors = [], - formErrorsTracker = {}, - keyHeldDown = false, - - // set at run-time - $field, - $group, - $message, - $prompt, - $submit, - $clear, - $reset, - - settings, - validation, - - metadata, - selector, - className, - regExp, - error, - - namespace, - moduleNamespace, - eventNamespace, - attachEventsSelector, - attachEventsAction, - - submitting = false, - dirty = false, - history = ['clean', 'clean'], - - instance, - module + $module = $(this); + var element = this; + + var formErrors = []; + var formErrorsTracker = {}; + var keyHeldDown = false; + + // set at run-time + var $field; + var $group; + var $message; + var $prompt; + var $submit; + var $clear; + var $reset; + + var settings; + var validation; + + var metadata; + var selector; + var className; + var regExp; + var error; + + var namespace; + var moduleNamespace; + var eventNamespace; + var attachEventsSelector; + var attachEventsAction; + + var submitting = false; + var dirty = false; + var history = ['clean', 'clean']; + + var instance; + var module ; module = { @@ -170,9 +170,9 @@ } $field.each(function (index, el) { var - $input = $(el), - type = $input.prop('type'), - inputEvent = module.get.changeEvent(type, $input) + $input = $(el); + var type = $input.prop('type'); + var inputEvent = module.get.changeEvent(type, $input) ; $input.on(inputEvent + eventNamespace, module.event.field.change); }); @@ -205,16 +205,16 @@ clear: function () { $field.each(function (index, el) { var - $field = $(el), - $element = $field.parent(), - $fieldGroup = $field.closest($group), - $prompt = $fieldGroup.find(selector.prompt), - $calendar = $field.closest(selector.uiCalendar), - defaultValue = $field.data(metadata.defaultValue) || '', - isCheckbox = $field.is(selector.checkbox), - isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'), - isCalendar = $calendar.length > 0 && module.can.useElement('calendar'), - isErrored = $fieldGroup.hasClass(className.error) + $field = $(el); + var $element = $field.parent(); + var $fieldGroup = $field.closest($group); + var $prompt = $fieldGroup.find(selector.prompt); + var $calendar = $field.closest(selector.uiCalendar); + var defaultValue = $field.data(metadata.defaultValue) || ''; + var isCheckbox = $field.is(selector.checkbox); + var isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'); + var isCalendar = $calendar.length > 0 && module.can.useElement('calendar'); + var isErrored = $fieldGroup.hasClass(className.error) ; if (isErrored) { module.verbose('Resetting error on field', $fieldGroup); @@ -239,17 +239,17 @@ reset: function () { $field.each(function (index, el) { var - $field = $(el), - $element = $field.parent(), - $fieldGroup = $field.closest($group), - $calendar = $field.closest(selector.uiCalendar), - $prompt = $fieldGroup.find(selector.prompt), - defaultValue = $field.data(metadata.defaultValue), - isCheckbox = $field.is(selector.checkbox), - isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'), - isCalendar = $calendar.length > 0 && module.can.useElement('calendar'), - isFile = $field.is(selector.file), - isErrored = $fieldGroup.hasClass(className.error) + $field = $(el); + var $element = $field.parent(); + var $fieldGroup = $field.closest($group); + var $calendar = $field.closest(selector.uiCalendar); + var $prompt = $fieldGroup.find(selector.prompt); + var defaultValue = $field.data(metadata.defaultValue); + var isCheckbox = $field.is(selector.checkbox); + var isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'); + var isCalendar = $calendar.length > 0 && module.can.useElement('calendar'); + var isFile = $field.is(selector.file); + var isErrored = $fieldGroup.hasClass(className.error) ; if (defaultValue === undefined) { return; @@ -281,9 +281,9 @@ allValid = true ; $field.each(function (index, el) { - var $el = $(el), - validation = module.get.validation($el) || {}, - identifier = module.get.identifier(validation, $el) + var $el = $(el); + var validation = module.get.validation($el) || {}; + var identifier = module.get.identifier(validation, $el) ; if (!module.validate.field(validation, identifier, true)) { allValid = false; @@ -297,9 +297,9 @@ $field.each(function (index, el) { var - $el = $(el), - isCheckbox = $el.filter(selector.checkbox).length > 0, - isDirty + $el = $(el); + var isCheckbox = $el.filter(selector.checkbox).length > 0; + var isDirty ; isDirty = isCheckbox @@ -422,15 +422,15 @@ field: { keydown: function (event) { var - $field = $(this), - key = event.which, - isInput = $field.is(selector.input), - isCheckbox = $field.is(selector.checkbox), - isInDropdown = $field.closest(selector.uiDropdown).length > 0, - keyCode = { - enter: 13, - escape: 27, - } + $field = $(this); + var key = event.which; + var isInput = $field.is(selector.input); + var isCheckbox = $field.is(selector.checkbox); + var isInDropdown = $field.closest(selector.uiDropdown).length > 0; + var keyCode = { + enter: 13, + escape: 27, + } ; if (key === keyCode.escape) { module.verbose('Escape key pressed blurring field'); @@ -455,9 +455,9 @@ }, blur: function (event) { var - $field = $(this), - validationRules = module.get.validation($field) || {}, - identifier = module.get.identifier(validationRules, $field) + $field = $(this); + var validationRules = module.get.validation($field) || {}; + var identifier = module.get.identifier(validationRules, $field) ; if (settings.on === 'blur' || (!$module.hasClass(className.initial) && settings.revalidate)) { module.debug('Revalidating field', $field, validationRules); @@ -469,9 +469,9 @@ }, change: function (event) { var - $field = $(this), - validationRules = module.get.validation($field) || {}, - identifier = module.get.identifier(validationRules, $field) + $field = $(this); + var validationRules = module.get.validation($field) || {}; + var identifier = module.get.identifier(validationRules, $field) ; if (settings.on === 'change' || (!$module.hasClass(className.initial) && settings.revalidate)) { clearTimeout(module.timer); @@ -555,18 +555,18 @@ }, prompt: function (rule, field) { var - ruleName = module.get.ruleName(rule), - ancillary = module.get.ancillaryValue(rule), - $field = module.get.field(field.identifier), - value = $field.val(), - promptCheck = rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule, - prompt = String(isFunction(promptCheck) - ? promptCheck.call($field[0], value) - : promptCheck), - requiresValue = prompt.search('{value}') !== -1, - requiresName = prompt.search('{name}') !== -1, - parts, - suffixPrompt + ruleName = module.get.ruleName(rule); + var ancillary = module.get.ancillaryValue(rule); + var $field = module.get.field(field.identifier); + var value = $field.val(); + var promptCheck = rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule; + var prompt = String(isFunction(promptCheck) + ? promptCheck.call($field[0], value) + : promptCheck); + var requiresValue = prompt.search('{value}') !== -1; + var requiresName = prompt.search('{name}') !== -1; + var parts; + var suffixPrompt ; if (ancillary && ['integer', 'decimal', 'number', 'size'].indexOf(ruleName) >= 0 && ancillary.indexOf('..') >= 0) { parts = ancillary.split('..', 2); @@ -666,9 +666,9 @@ }, fieldLabel: function (identifier, useIdAsFallback) { var $field = typeof identifier === 'string' - ? module.get.field(identifier) - : identifier, - $label = $field.closest(selector.group).find('label:not(:empty)').eq(0) + ? module.get.field(identifier) + : identifier; + var $label = $field.closest(selector.group).find('label:not(:empty)').eq(0) ; return $label.length === 1 @@ -677,8 +677,8 @@ }, validation: function ($field) { var - fieldValidation, - identifier + fieldValidation; + var identifier ; if (!validation) { return false; @@ -699,9 +699,9 @@ }, value: function (field, strict) { var - fields = [], - results, - resultKeys + fields = []; + var results; + var resultKeys ; fields.push(field); results = module.get.values.call(element, fields, strict); @@ -713,22 +713,22 @@ var $fields = Array.isArray(fields) && fields.length > 0 ? module.get.fields(fields, strict) - : $field, - values = {} + : $field; + var values = {} ; $fields.each(function (index, field) { var - $field = $(field), - $calendar = $field.closest(selector.uiCalendar), - name = $field.prop('name') || $field.prop('id'), - value = $field.val(), - isCheckbox = $field.is(selector.checkbox), - isRadio = $field.is(selector.radio), - isMultiple = name.indexOf('[]') !== -1, - isCalendar = $calendar.length > 0 && module.can.useElement('calendar'), - isChecked = isCheckbox - ? $field.is(':checked') - : false + $field = $(field); + var $calendar = $field.closest(selector.uiCalendar); + var name = $field.prop('name') || $field.prop('id'); + var value = $field.val(); + var isCheckbox = $field.is(selector.checkbox); + var isRadio = $field.is(selector.radio); + var isMultiple = name.indexOf('[]') !== -1; + var isCalendar = $calendar.length > 0 && module.can.useElement('calendar'); + var isChecked = isCheckbox + ? $field.is(':checked') + : false ; if (name) { if (isMultiple) { @@ -919,11 +919,11 @@ return; } var - $field = module.get.field(identifier), - $fieldGroup = $field.closest($group), - $prompt = $fieldGroup.children(selector.prompt), - promptExists = $prompt.length > 0, - canTransition = settings.transition && module.can.useElement('transition') + $field = module.get.field(identifier); + var $fieldGroup = $field.closest($group); + var $prompt = $fieldGroup.children(selector.prompt); + var promptExists = $prompt.length > 0; + var canTransition = settings.transition && module.can.useElement('transition') ; module.verbose('Adding field error state', identifier); if (!internal) { @@ -977,8 +977,8 @@ } module.debug('Adding form error messages', errors); module.set.error(); - var customErrors = [], - tempErrors + var customErrors = []; + var tempErrors ; if ($.isPlainObject(errors)) { $.each(Object.keys(errors), function (i, id) { @@ -1072,9 +1072,9 @@ }, prompt: function (identifier) { var - $field = module.get.field(identifier), - $fieldGroup = $field.closest($group), - $prompt = $fieldGroup.children(selector.prompt) + $field = module.get.field(identifier); + var $fieldGroup = $field.closest($group); + var $prompt = $fieldGroup.children(selector.prompt) ; $fieldGroup .removeClass(className.error) @@ -1106,15 +1106,15 @@ defaults: function () { $field.each(function (index, el) { var - $el = $(el), - $parent = $el.parent(), - isCheckbox = $el.filter(selector.checkbox).length > 0, - isDropdown = ($parent.is(selector.uiDropdown) || $el.is(selector.uiDropdown)) && module.can.useElement('dropdown'), - $calendar = $el.closest(selector.uiCalendar), - isCalendar = $calendar.length > 0 && module.can.useElement('calendar'), - value = isCheckbox - ? $el.is(':checked') - : $el.val() + $el = $(el); + var $parent = $el.parent(); + var isCheckbox = $el.filter(selector.checkbox).length > 0; + var isDropdown = ($parent.is(selector.uiDropdown) || $el.is(selector.uiDropdown)) && module.can.useElement('dropdown'); + var $calendar = $el.closest(selector.uiCalendar); + var isCalendar = $calendar.length > 0 && module.can.useElement('calendar'); + var value = isCheckbox + ? $el.is(':checked') + : $el.val() ; if (isDropdown) { if ($parent.is(selector.uiDropdown)) { @@ -1149,17 +1149,17 @@ } $.each(fields, function (key, value) { var - $field = module.get.field(key), - $element = $field.parent(), - $calendar = $field.closest(selector.uiCalendar), - isFile = $field.is(selector.file), - isMultiple = Array.isArray(value), - isCheckbox = $element.is(selector.uiCheckbox) && module.can.useElement('checkbox'), - isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'), - isRadio = $field.is(selector.radio) && isCheckbox, - isCalendar = $calendar.length > 0 && module.can.useElement('calendar'), - fieldExists = $field.length > 0, - $multipleField + $field = module.get.field(key); + var $element = $field.parent(); + var $calendar = $field.closest(selector.uiCalendar); + var isFile = $field.is(selector.file); + var isMultiple = Array.isArray(value); + var isCheckbox = $element.is(selector.uiCheckbox) && module.can.useElement('checkbox'); + var isDropdown = $element.is(selector.uiDropdown) && module.can.useElement('dropdown'); + var isRadio = $field.is(selector.radio) && isCheckbox; + var isCalendar = $calendar.length > 0 && module.can.useElement('calendar'); + var fieldExists = $field.length > 0; + var $multipleField ; if (fieldExists) { if (isMultiple && isCheckbox) { @@ -1240,18 +1240,18 @@ } $field.each(function (_index, el) { var - $el = $(el), - $elGroup = $el.closest($group), - isCheckbox = $el.filter(selector.checkbox).length > 0, - isRequired = $el.prop('required') || $elGroup.hasClass(className.required) || $elGroup.parent().hasClass(className.required), - isDisabled = $el.is(':disabled') || $elGroup.hasClass(className.disabled) || $elGroup.parent().hasClass(className.disabled), - validation = module.get.validation($el), - hasNotEmptyRule = validation - ? $.grep(validation.rules, function (rule) { - return ['notEmpty', 'checked', 'empty'].indexOf(rule.type) >= 0; - }).length > 0 - : false, - identifier = module.get.identifier(validation, $el) + $el = $(el); + var $elGroup = $el.closest($group); + var isCheckbox = $el.filter(selector.checkbox).length > 0; + var isRequired = $el.prop('required') || $elGroup.hasClass(className.required) || $elGroup.parent().hasClass(className.required); + var isDisabled = $el.is(':disabled') || $elGroup.hasClass(className.disabled) || $elGroup.parent().hasClass(className.disabled); + var validation = module.get.validation($el); + var hasNotEmptyRule = validation + ? $.grep(validation.rules, function (rule) { + return ['notEmpty', 'checked', 'empty'].indexOf(rule.type) >= 0; + }).length > 0 + : false; + var identifier = module.get.identifier(validation, $el) ; if (isRequired && !isDisabled && !hasNotEmptyRule && identifier !== undefined) { if (isCheckbox) { @@ -1309,8 +1309,8 @@ } if (settings.errorFocus && ignoreCallbacks !== true) { var - $focusElement, - hasTabIndex = true + $focusElement; + var hasTabIndex = true ; if (typeof settings.errorFocus === 'string') { $focusElement = $(document).find(settings.errorFocus); @@ -1350,18 +1350,18 @@ return true; } var - identifier = field.identifier || fieldName, - $field = module.get.field(identifier), - $fieldGroup = $field.closest($group), - $dependsField = field.depends - ? module.get.field(field.depends) - : false, - fieldValid = true, - fieldErrors = [], - isDisabled = $field.filter(':not(:disabled)').length === 0 || $fieldGroup.hasClass(className.disabled) || $fieldGroup.parent().hasClass(className.disabled), - validationMessage = $field[0].validationMessage, - noNativeValidation = field.noNativeValidation || settings.noNativeValidation || $field.filter('[formnovalidate],[novalidate]').length > 0 || $module.filter('[novalidate]').length > 0, - errorLimit + identifier = field.identifier || fieldName; + var $field = module.get.field(identifier); + var $fieldGroup = $field.closest($group); + var $dependsField = field.depends + ? module.get.field(field.depends) + : false; + var fieldValid = true; + var fieldErrors = []; + var isDisabled = $field.filter(':not(:disabled)').length === 0 || $fieldGroup.hasClass(className.disabled) || $fieldGroup.parent().hasClass(className.disabled); + var validationMessage = $field[0].validationMessage; + var noNativeValidation = field.noNativeValidation || settings.noNativeValidation || $field.filter('[formnovalidate],[novalidate]').length > 0 || $module.filter('[novalidate]').length > 0; + var errorLimit ; if (!field.identifier) { module.debug('Using field name as identifier', identifier); @@ -1435,23 +1435,23 @@ // takes validation rule and returns whether field passes rule rule: function (field, rule, internal) { var - $field = module.get.field(field.identifier), - ancillary = module.get.ancillaryValue(rule), - ruleName = module.get.ruleName(rule), - ruleFunction = settings.rules[ruleName], - invalidFields = [], - isCheckbox = $field.is(selector.checkbox), - isValid = function (field) { - var value = isCheckbox ? $(field).filter(':checked').val() : $(field).val(); - // cast to string avoiding encoding special values - value = value === undefined || value === '' || value === null - ? '' - : ((settings.shouldTrim && rule.shouldTrim !== false) || rule.shouldTrim - ? String(value + '').trim() - : String(value + '')); - - return ruleFunction.call(field, value, ancillary, module); - } + $field = module.get.field(field.identifier); + var ancillary = module.get.ancillaryValue(rule); + var ruleName = module.get.ruleName(rule); + var ruleFunction = settings.rules[ruleName]; + var invalidFields = []; + var isCheckbox = $field.is(selector.checkbox); + var isValid = function (field) { + var value = isCheckbox ? $(field).filter(':checked').val() : $(field).val(); + // cast to string avoiding encoding special values + value = value === undefined || value === '' || value === null + ? '' + : ((settings.shouldTrim && rule.shouldTrim !== false) || rule.shouldTrim + ? String(value + '').trim() + : String(value + '')); + + return ruleFunction.call(field, value, ancillary, module); + } ; if (!isFunction(ruleFunction)) { module.error(error.noRule, ruleName); @@ -1527,9 +1527,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -1550,8 +1550,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -1578,10 +1578,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; @@ -1864,8 +1864,8 @@ return value.match(regExp); } var - regExpParts = regExp.match($.fn.form.settings.regExp.flags), - flags + regExpParts = regExp.match($.fn.form.settings.regExp.flags); + var flags ; // regular expression specified as /baz/gi (flags) if (regExpParts) { @@ -1897,9 +1897,9 @@ regExp = $.fn.form.settings.regExp.integer; } var - min, - max, - parts + min; + var max; + var parts ; if (!range || ['', '..'].indexOf(range) !== -1) { @@ -2085,14 +2085,14 @@ pattern: /^(4026|417500|4508|4844|491(3|7))/, length: [16], }, - }, - valid = {}, - validCard = false, - requiredTypes = typeof cardTypes === 'string' - ? cardTypes.split(',') - : false, - unionPay, - validation + }; + var valid = {}; + var validCard = false; + var requiredTypes = typeof cardTypes === 'string' + ? cardTypes.split(',') + : false; + var unionPay; + var validation ; if (typeof cardNumber !== 'string' || cardNumber.length === 0) { @@ -2134,13 +2134,13 @@ // verify luhn, adapted from var - length = cardNumber.length, - multiple = 0, - producedValue = [ - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 2, 4, 6, 8, 1, 3, 5, 7, 9], - ], - sum = 0 + length = cardNumber.length; + var multiple = 0; + var producedValue = [ + [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], + [0, 2, 4, 6, 8, 1, 3, 5, 7, 9], + ]; + var sum = 0 ; while (length--) { sum += producedValue[multiple][parseInt(cardNumber.charAt(length), 10)]; diff --git a/src/definitions/behaviors/state.js b/src/definitions/behaviors/state.js index c8c29ea0f7..1fb1d4842f 100644 --- a/src/definitions/behaviors/state.js +++ b/src/definitions/behaviors/state.js @@ -21,52 +21,52 @@ $.fn.state = function (parameters) { var - $allModules = $(this), - - 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 = $(context); - } else { - $context = $(win.document).find(context); - if ($context.length === 0) { - $context = win.frameElement ? contextCheck(context, win.parent) : window; - } + $allModules = $(this); + + var time = Date.now(); + var performance = []; + + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var contextCheck = function (context, win) { + var $context; + if ([window, document].indexOf(context) >= 0) { + $context = $(context); + } else { + $context = $(win.document).find(context); + if ($context.length === 0) { + $context = win.frameElement ? contextCheck(context, win.parent) : window; } + } - return $context; - }, - returnedValue + return $context; + }; + var returnedValue ; $allModules.each(function () { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.state.settings, parameters) - : $.extend({}, $.fn.state.settings), + : $.extend({}, $.fn.state.settings); - error = settings.error, - metadata = settings.metadata, - className = settings.className, - namespace = settings.namespace, - states = settings.states, - text = settings.text, + var error = settings.error; + var metadata = settings.metadata; + var className = settings.className; + var namespace = settings.namespace; + var states = settings.states; + var text = settings.text; - eventNamespace = '.' + namespace, - moduleNamespace = namespace + '-module', + var eventNamespace = '.' + namespace; + var moduleNamespace = namespace + '-module'; - $module = $(this), - $context = settings.context ? contextCheck(settings.context, window) : $module, + var $module = $(this); + var $context = settings.context ? contextCheck(settings.context, window) : $module; - element = this, - instance = $module.data(moduleNamespace), + var element = this; + var instance = $module.data(moduleNamespace); - module + var module ; module = { @@ -204,8 +204,8 @@ toggle: { state: function () { var - apiRequest, - requestCancelled + apiRequest; + var requestCancelled ; if (module.allows('active') && module.is.enabled()) { module.refresh(); @@ -374,8 +374,8 @@ // on mouseout sets text to previous value text: function () { var - activeText = text.active || $module.data(metadata.storedText), - inactiveText = text.inactive || $module.data(metadata.storedText) + activeText = text.active || $module.data(metadata.storedText); + var inactiveText = text.inactive || $module.data(metadata.storedText) ; if (module.is.textEnabled()) { if (module.is.active() && activeText) { @@ -465,9 +465,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -488,8 +488,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -513,10 +513,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; diff --git a/src/definitions/behaviors/visibility.js b/src/definitions/behaviors/visibility.js index f17cf07e8c..665221689d 100755 --- a/src/definitions/behaviors/visibility.js +++ b/src/definitions/behaviors/visibility.js @@ -21,62 +21,62 @@ $.fn.visibility = function (parameters) { var - $allModules = $(this), - - 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 = $(context); - } else { - $context = $(win.document).find(context); - if ($context.length === 0) { - $context = win.frameElement ? contextCheck(context, win.parent) : window; - } + $allModules = $(this); + + var time = Date.now(); + var performance = []; + + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var contextCheck = function (context, win) { + var $context; + if ([window, document].indexOf(context) >= 0) { + $context = $(context); + } else { + $context = $(win.document).find(context); + if ($context.length === 0) { + $context = win.frameElement ? contextCheck(context, win.parent) : window; } + } - return $context; - }, - returnedValue, + return $context; + }; + var returnedValue; - moduleCount = $allModules.length, - loadedCount = 0 + var moduleCount = $allModules.length; + var loadedCount = 0 ; $allModules.each(function () { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.visibility.settings, parameters) - : $.extend({}, $.fn.visibility.settings), + : $.extend({}, $.fn.visibility.settings); - className = settings.className, - namespace = settings.namespace, - error = settings.error, - metadata = settings.metadata, + var className = settings.className; + var namespace = settings.namespace; + var error = settings.error; + var metadata = settings.metadata; - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; - $window = $(window), + var $window = $(window); - $module = $(this), - $context = contextCheck(settings.context, window), + var $module = $(this); + var $context = contextCheck(settings.context, window); - $placeholder, + var $placeholder; - instance = $module.data(moduleNamespace), + var instance = $module.data(moduleNamespace); - element = this, - disabled = false, + var element = this; + var disabled = false; - contextObserver, - observer, - module + var contextObserver; + var observer; + var module ; module = { @@ -235,18 +235,18 @@ images = [images]; } var - imagesLength = images.length, - loadedCounter = 0, - cache = [], - cacheImage = document.createElement('img'), - handleLoad = function () { - loadedCounter++; - if (loadedCounter >= images.length) { - if (isFunction(callback)) { - callback(); - } + imagesLength = images.length; + var loadedCounter = 0; + var cache = []; + var cacheImage = document.createElement('img'); + var handleLoad = function () { + loadedCounter++; + if (loadedCounter >= images.length) { + if (isFunction(callback)) { + callback(); } } + } ; while (imagesLength--) { cacheImage = document.createElement('img'); @@ -533,9 +533,9 @@ onScreen: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onOnScreen, - callbackName = 'onScreen' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onOnScreen; + var callbackName = 'onScreen' ; if (newCallback) { module.debug('Adding callback for onScreen', newCallback); @@ -553,9 +553,9 @@ offScreen: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onOffScreen, - callbackName = 'offScreen' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onOffScreen; + var callbackName = 'offScreen' ; if (newCallback) { module.debug('Adding callback for offScreen', newCallback); @@ -573,9 +573,9 @@ passing: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onPassing, - callbackName = 'passing' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onPassing; + var callbackName = 'passing' ; if (newCallback) { module.debug('Adding callback for passing', newCallback); @@ -593,9 +593,9 @@ topVisible: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onTopVisible, - callbackName = 'topVisible' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onTopVisible; + var callbackName = 'topVisible' ; if (newCallback) { module.debug('Adding callback for top visible', newCallback); @@ -613,9 +613,9 @@ bottomVisible: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onBottomVisible, - callbackName = 'bottomVisible' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onBottomVisible; + var callbackName = 'bottomVisible' ; if (newCallback) { module.debug('Adding callback for bottom visible', newCallback); @@ -633,9 +633,9 @@ topPassed: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onTopPassed, - callbackName = 'topPassed' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onTopPassed; + var callbackName = 'topPassed' ; if (newCallback) { module.debug('Adding callback for top passed', newCallback); @@ -653,9 +653,9 @@ bottomPassed: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onBottomPassed, - callbackName = 'bottomPassed' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onBottomPassed; + var callbackName = 'bottomPassed' ; if (newCallback) { module.debug('Adding callback for bottom passed', newCallback); @@ -673,9 +673,9 @@ passingReverse: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onPassingReverse, - callbackName = 'passingReverse' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onPassingReverse; + var callbackName = 'passingReverse' ; if (newCallback) { module.debug('Adding callback for passing reverse', newCallback); @@ -695,9 +695,9 @@ topVisibleReverse: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onTopVisibleReverse, - callbackName = 'topVisibleReverse' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onTopVisibleReverse; + var callbackName = 'topVisibleReverse' ; if (newCallback) { module.debug('Adding callback for top visible reverse', newCallback); @@ -717,9 +717,9 @@ bottomVisibleReverse: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onBottomVisibleReverse, - callbackName = 'bottomVisibleReverse' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onBottomVisibleReverse; + var callbackName = 'bottomVisibleReverse' ; if (newCallback) { module.debug('Adding callback for bottom visible reverse', newCallback); @@ -739,9 +739,9 @@ topPassedReverse: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onTopPassedReverse, - callbackName = 'topPassedReverse' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onTopPassedReverse; + var callbackName = 'topPassedReverse' ; if (newCallback) { module.debug('Adding callback for top passed reverse', newCallback); @@ -761,9 +761,9 @@ bottomPassedReverse: function (newCallback) { var - calculations = module.get.elementCalculations(), - callback = newCallback || settings.onBottomPassedReverse, - callbackName = 'bottomPassedReverse' + calculations = module.get.elementCalculations(); + var callback = newCallback || settings.onBottomPassedReverse; + var callbackName = 'bottomPassedReverse' ; if (newCallback) { module.debug('Adding callback for bottom passed reverse', newCallback); @@ -783,8 +783,8 @@ execute: function (callback, callbackName) { var - calculations = module.get.elementCalculations(), - screen = module.get.screenCalculations() + calculations = module.get.elementCalculations(); + var screen = module.get.screenCalculations() ; callback = callback || false; if (callback) { @@ -855,9 +855,9 @@ }, direction: function () { var - scroll = module.get.scroll(), - lastScroll = module.get.lastScroll(), - direction + scroll = module.get.scroll(); + var lastScroll = module.get.lastScroll(); + var direction ; if (scroll > lastScroll && lastScroll) { direction = 'down'; @@ -872,8 +872,8 @@ }, elementPosition: function () { var - element = module.cache.element, - screen = module.get.screenSize() + element = module.cache.element; + var screen = module.get.screenSize() ; module.verbose('Saving element position'); // (quicker than $.extend) @@ -895,8 +895,8 @@ }, elementCalculations: function () { var - screen = module.get.screenCalculations(), - element = module.get.elementPosition() + screen = module.get.screenCalculations(); + var element = module.get.elementPosition() ; // offset if (settings.includeMargin) { @@ -1071,9 +1071,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -1094,8 +1094,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -1119,10 +1119,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; diff --git a/src/definitions/globals/site.js b/src/definitions/globals/site.js index a86fbd653b..475e052bf6 100644 --- a/src/definitions/globals/site.js +++ b/src/definitions/globals/site.js @@ -21,29 +21,29 @@ $.fn.site = function (parameters) { var - time = Date.now(), - performance = [], + time = Date.now(); + var performance = []; - query = arguments[0], - methodInvoked = typeof query === 'string', - queryArguments = [].slice.call(arguments, 1), + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); - settings = $.isPlainObject(parameters) - ? $.extend(true, {}, $.site.settings, parameters) - : $.extend({}, $.site.settings), + var settings = $.isPlainObject(parameters) + ? $.extend(true, {}, $.site.settings, parameters) + : $.extend({}, $.site.settings); - namespace = settings.namespace, - error = settings.error, + var namespace = settings.namespace; + var error = settings.error; - moduleNamespace = 'module-' + namespace, + var moduleNamespace = 'module-' + namespace; - $document = $(document), - $module = $document, - element = this, - instance = $module.data(moduleNamespace), + var $document = $(document); + var $module = $document; + var element = this; + var instance = $module.data(moduleNamespace); - module, - returnedValue + var module; + var returnedValue ; module = { @@ -122,8 +122,8 @@ var namespace = module.moduleExists(name) ? $.fn[name].settings.namespace || false - : true, - $existingModules + : true; + var $existingModules ; if (module.moduleExists(name)) { module.verbose('Changing default setting', setting, value, name); @@ -275,9 +275,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -298,8 +298,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -323,10 +323,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; diff --git a/src/definitions/modules/accordion.js b/src/definitions/modules/accordion.js index 2cc1186562..b49acd44e3 100644 --- a/src/definitions/modules/accordion.js +++ b/src/definitions/modules/accordion.js @@ -21,39 +21,39 @@ $.fn.accordion = function (parameters) { var - $allModules = $(this), + $allModules = $(this); - time = Date.now(), - performance = [], + var time = Date.now(); + var performance = []; - query = arguments[0], - methodInvoked = typeof query === 'string', - queryArguments = [].slice.call(arguments, 1), + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); - returnedValue + var returnedValue ; $allModules.each(function () { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.accordion.settings, parameters) - : $.extend({}, $.fn.accordion.settings), + : $.extend({}, $.fn.accordion.settings); - className = settings.className, - namespace = settings.namespace, - selector = settings.selector, - error = settings.error, + var className = settings.className; + var namespace = settings.namespace; + var selector = settings.selector; + var error = settings.error; - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; - $module = $(this), - $title = $module.find(selector.title), - $content = $module.find(selector.content), + var $module = $(this); + var $title = $module.find(selector.title); + var $content = $module.find(selector.content); - element = this, - instance = $module.data(moduleNamespace), - observer, - module + var element = this; + var instance = $module.data(moduleNamespace); + var observer; + var module ; module = { @@ -124,12 +124,12 @@ ? (typeof query === 'number' ? $title.eq(query) : $(query).closest(selector.title)) - : $(this).closest(selector.title), - $activeContent = $activeTitle.next($content), - isAnimating = $activeContent.hasClass(className.animating), - isActive = $activeContent.hasClass(className.active), - isOpen = isActive && !isAnimating, - isOpening = !isActive && isAnimating + : $(this).closest(selector.title); + var $activeContent = $activeTitle.next($content); + var isAnimating = $activeContent.hasClass(className.animating); + var isActive = $activeContent.hasClass(className.active); + var isOpen = isActive && !isAnimating; + var isOpening = !isActive && isAnimating ; module.debug('Toggling visibility of content', $activeTitle); if (isOpen || isOpening) { @@ -149,11 +149,11 @@ ? (typeof query === 'number' ? $title.eq(query) : $(query).closest(selector.title)) - : $(this).closest(selector.title), - $activeContent = $activeTitle.next($content), - isAnimating = $activeContent.hasClass(className.animating), - isActive = $activeContent.hasClass(className.active), - isOpen = isActive || isAnimating + : $(this).closest(selector.title); + var $activeContent = $activeTitle.next($content); + var isAnimating = $activeContent.hasClass(className.animating); + var isActive = $activeContent.hasClass(className.active); + var isOpen = isActive || isAnimating ; if (isOpen) { module.debug('Accordion already open, skipping', $activeContent); @@ -219,12 +219,12 @@ ? (typeof query === 'number' ? $title.eq(query) : $(query).closest(selector.title)) - : $(this).closest(selector.title), - $activeContent = $activeTitle.next($content), - isAnimating = $activeContent.hasClass(className.animating), - isActive = $activeContent.hasClass(className.active), - isOpening = !isActive && isAnimating, - isClosing = isActive && isAnimating + : $(this).closest(selector.title); + var $activeContent = $activeTitle.next($content); + var isAnimating = $activeContent.hasClass(className.animating); + var isActive = $activeContent.hasClass(className.active); + var isOpening = !isActive && isAnimating; + var isClosing = isActive && isAnimating ; if ((isActive || isOpening) && !isClosing) { module.debug('Closing accordion content', $activeContent); @@ -279,14 +279,14 @@ var $activeTitle = index !== undefined ? $title.eq(index) - : $(this).closest(selector.title), - $parentTitles = $activeTitle.parents(selector.content).prev(selector.title), - $activeAccordion = $activeTitle.closest(selector.accordion), - activeSelector = selector.title + '.' + className.active + ':visible', - activeContent = selector.content + '.' + className.active + ':visible', - $openTitles, - $nestedTitles, - $openContents + : $(this).closest(selector.title); + var $parentTitles = $activeTitle.parents(selector.content).prev(selector.title); + var $activeAccordion = $activeTitle.closest(selector.accordion); + var activeSelector = selector.title + '.' + className.active + ':visible'; + var activeContent = selector.content + '.' + className.active + ':visible'; + var $openTitles; + var $nestedTitles; + var $openContents ; if (settings.closeNested) { $openTitles = $activeAccordion.find(activeSelector).not($parentTitles); @@ -421,9 +421,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -444,8 +444,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -469,10 +469,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; diff --git a/src/definitions/modules/calendar.js b/src/definitions/modules/calendar.js index d1e6f41919..767894b625 100644 --- a/src/definitions/modules/calendar.js +++ b/src/definitions/modules/calendar.js @@ -21,59 +21,59 @@ $.fn.calendar = function (parameters) { var - $allModules = $(this), - $document = $(document), - - time = Date.now(), - performance = [], - - query = arguments[0], - methodInvoked = typeof query === 'string', - queryArguments = [].slice.call(arguments, 1), - returnedValue, - timeGapTable = { - 5: { row: 4, column: 3 }, - 10: { row: 3, column: 2 }, - 15: { row: 2, column: 2 }, - 20: { row: 3, column: 1 }, - 30: { row: 2, column: 1 }, - }, - numberText = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'] + $allModules = $(this); + var $document = $(document); + + var time = Date.now(); + var performance = []; + + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var returnedValue; + var timeGapTable = { + 5: { row: 4, column: 3 }, + 10: { row: 3, column: 2 }, + 15: { row: 2, column: 2 }, + 20: { row: 3, column: 1 }, + 30: { row: 2, column: 1 }, + }; + var numberText = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'] ; $allModules.each(function () { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.calendar.settings, parameters) - : $.extend({}, $.fn.calendar.settings), - - className = settings.className, - namespace = settings.namespace, - selector = settings.selector, - formatter = settings.formatter, - parser = settings.parser, - metadata = settings.metadata, - timeGap = timeGapTable[settings.minTimeGap], - error = settings.error, - - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, - - $module = $(this), - $input = $module.find(selector.input), - $activator = $module.find(selector.activator), - - element = this, - instance = $module.data(moduleNamespace), - $container = instance && instance.popupId ? $document.find('#' + instance.popupId) : $module.find(selector.popup), - - isTouch, - isTouchDown = false, - isInverted = $module.hasClass(className.inverted), - focusDateUsedForRange = false, - selectionComplete = false, - classObserver, - module + : $.extend({}, $.fn.calendar.settings); + + var className = settings.className; + var namespace = settings.namespace; + var selector = settings.selector; + var formatter = settings.formatter; + var parser = settings.parser; + var metadata = settings.metadata; + var timeGap = timeGapTable[settings.minTimeGap]; + var error = settings.error; + + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; + + var $module = $(this); + var $input = $module.find(selector.input); + var $activator = $module.find(selector.activator); + + var element = this; + var instance = $module.data(moduleNamespace); + var $container = instance && instance.popupId ? $document.find('#' + instance.popupId) : $module.find(selector.popup); + + var isTouch; + var isTouchDown = false; + var isInverted = $module.hasClass(className.inverted); + var focusDateUsedForRange = false; + var selectionComplete = false; + var classObserver; + var module ; module = { @@ -151,8 +151,8 @@ // prepend the popup element to the activator's parent so that it has less chance of messing with // the styling (e.g., input action button needs to be the last child to have the correct border radius) var - $activatorParent = $activator.parent(), - domPositionFunction = $activatorParent.closest(selector.append).length > 0 ? 'appendTo' : 'prependTo' + $activatorParent = $activator.parent(); + var domPositionFunction = $activatorParent.closest(selector.append).length > 0 ? 'appendTo' : 'prependTo' ; $container = $('
').addClass(className.popup)[domPositionFunction]($activatorParent); } @@ -249,21 +249,21 @@ create: { calendar: function () { var - i, - r, - c, - p, - row, - cell, - pageGrid + i; + var r; + var c; + var p; + var row; + var cell; + var pageGrid ; var - mode = module.get.mode(), - today = new Date(), - date = module.get.date(), - focusDate = module.get.focusDate(), - display = module.helper.dateInRange(focusDate || date || parser.date(settings.initialDate, settings) || today) + mode = module.get.mode(); + var today = new Date(); + var date = module.get.date(); + var focusDate = module.get.focusDate(); + var display = module.helper.dateInRange(focusDate || date || parser.date(settings.initialDate, settings) || today) ; if (!focusDate) { @@ -272,23 +272,23 @@ } var - isYear = mode === 'year', - isMonth = mode === 'month', - isDay = mode === 'day', - isHour = mode === 'hour', - isMinute = mode === 'minute', - isTimeOnly = settings.type === 'time' + isYear = mode === 'year'; + var isMonth = mode === 'month'; + var isDay = mode === 'day'; + var isHour = mode === 'hour'; + var isMinute = mode === 'minute'; + var isTimeOnly = settings.type === 'time' ; var multiMonth = Math.max(settings.multiMonth, 1); var monthOffset = !isDay ? 0 : module.get.monthOffset(); var - minute = display.getMinutes(), - hour = display.getHours(), - day = display.getDate(), - startMonth = display.getMonth() + monthOffset, - year = display.getFullYear() + minute = display.getMinutes(); + var hour = display.getHours(); + var day = display.getDate(); + var startMonth = display.getMonth() + monthOffset; + var year = display.getFullYear() ; var columns = isDay @@ -318,26 +318,26 @@ } var - yearChange = isYear ? 10 : (isMonth ? 1 : 0), - monthChange = isDay ? 1 : 0, - dayChange = isHour || isMinute ? 1 : 0, - prevNextDay = isHour || isMinute ? day : 1, - prevDate = new Date(year - yearChange, month - monthChange, prevNextDay - dayChange, hour), - nextDate = new Date(year + yearChange, month + monthChange, prevNextDay + dayChange, hour), - prevLast = isYear - ? new Date(Math.ceil(year / 10) * 10 - 9, 0, 0) - : (isMonth - ? new Date(year, 0, 0) - : (isDay // eslint-disable-line unicorn/no-nested-ternary - ? new Date(year, month, 0) - : new Date(year, month, day, -1))), - nextFirst = isYear - ? new Date(Math.ceil(year / 10) * 10 + 1, 0, 1) - : (isMonth - ? new Date(year + 1, 0, 1) - : (isDay // eslint-disable-line unicorn/no-nested-ternary - ? new Date(year, month + 1, 1) - : new Date(year, month, day + 1))) + yearChange = isYear ? 10 : (isMonth ? 1 : 0); + var monthChange = isDay ? 1 : 0; + var dayChange = isHour || isMinute ? 1 : 0; + var prevNextDay = isHour || isMinute ? day : 1; + var prevDate = new Date(year - yearChange, month - monthChange, prevNextDay - dayChange, hour); + var nextDate = new Date(year + yearChange, month + monthChange, prevNextDay + dayChange, hour); + var prevLast = isYear + ? new Date(Math.ceil(year / 10) * 10 - 9, 0, 0) + : (isMonth + ? new Date(year, 0, 0) + : (isDay // eslint-disable-line unicorn/no-nested-ternary + ? new Date(year, month, 0) + : new Date(year, month, day, -1))); + var nextFirst = isYear + ? new Date(Math.ceil(year / 10) * 10 + 1, 0, 1) + : (isMonth + ? new Date(year + 1, 0, 1) + : (isDay // eslint-disable-line unicorn/no-nested-ternary + ? new Date(year, month + 1, 1) + : new Date(year, month, day + 1))) ; var tempMode = mode; @@ -790,11 +790,11 @@ get: { weekOfYear: function (weekYear, weekMonth, weekDay) { // adapted from http://www.merlyn.demon.co.uk/weekcalc.htm - var ms1d = 24 * 3600 * 1000, - ms7d = 7 * ms1d, - DC3 = Date.UTC(weekYear, weekMonth, weekDay + 3) / ms1d, // an absolute day number - AWN = Math.floor(DC3 / 7), // an absolute week number - Wyr = new Date(AWN * ms7d).getUTCFullYear() + var ms1d = 24 * 3600 * 1000; + var ms7d = 7 * ms1d; + var DC3 = Date.UTC(weekYear, weekMonth, weekDay + 3) / ms1d; // an absolute day number + var AWN = Math.floor(DC3 / 7); // an absolute week number + var Wyr = new Date(AWN * ms7d).getUTCFullYear() ; return AWN - Math.floor(Date.UTC(Wyr, 0, 7) / ms7d) + 1; @@ -1095,44 +1095,44 @@ } var - D = date.getDate(), - M = date.getMonth(), - Y = date.getFullYear(), - d = date.getDay(), - H = date.getHours(), - m = date.getMinutes(), - s = date.getSeconds(), - w = module.get.weekOfYear(Y, M, D + 1 - settings.firstDayOfWeek), - h = H % 12 || 12, - a = H < 12 ? settings.text.am.toLowerCase() : settings.text.pm.toLowerCase(), - tokens = { - D: D, - DD: ('0' + D).slice(-2), - M: M + 1, - MM: ('0' + (M + 1)).slice(-2), - MMM: settings.text.monthsShort[M], - MMMM: settings.text.months[M], - Y: Y, - YY: String(Y).slice(2), - YYYY: Y, - d: d, - dd: settings.text.dayNamesShort[d].slice(0, 2), - ddd: settings.text.dayNamesShort[d], - dddd: settings.text.dayNames[d], - h: h, - hh: ('0' + h).slice(-2), - H: H, - HH: ('0' + H).slice(-2), - m: m, - mm: ('0' + m).slice(-2), - s: s, - ss: ('0' + s).slice(-2), - a: a, - A: a.toUpperCase(), - S: ['th', 'st', 'nd', 'rd'][(D % 10) > 3 ? 0 : ((D % 100) - (D % 10) === 10 ? 0 : D % 10)], - w: w, - ww: ('0' + w).slice(-2), - } + D = date.getDate(); + var M = date.getMonth(); + var Y = date.getFullYear(); + var d = date.getDay(); + var H = date.getHours(); + var m = date.getMinutes(); + var s = date.getSeconds(); + var w = module.get.weekOfYear(Y, M, D + 1 - settings.firstDayOfWeek); + var h = H % 12 || 12; + var a = H < 12 ? settings.text.am.toLowerCase() : settings.text.pm.toLowerCase(); + var tokens = { + D: D, + DD: ('0' + D).slice(-2), + M: M + 1, + MM: ('0' + (M + 1)).slice(-2), + MMM: settings.text.monthsShort[M], + MMMM: settings.text.months[M], + Y: Y, + YY: String(Y).slice(2), + YYYY: Y, + d: d, + dd: settings.text.dayNamesShort[d].slice(0, 2), + ddd: settings.text.dayNamesShort[d], + dddd: settings.text.dayNames[d], + h: h, + hh: ('0' + h).slice(-2), + H: H, + HH: ('0' + H).slice(-2), + m: m, + mm: ('0' + m).slice(-2), + s: s, + ss: ('0' + s).slice(-2), + a: a, + A: a.toUpperCase(), + S: ['th', 'st', 'nd', 'rd'][(D % 10) > 3 ? 0 : ((D % 100) - (D % 10) === 10 ? 0 : D % 10)], + w: w, + ww: ('0' + w).slice(-2), + } ; return format.replace(settings.regExp.token, function (match) { @@ -1494,9 +1494,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -1517,8 +1517,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -1542,10 +1542,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; @@ -1728,16 +1728,16 @@ text = text.toLowerCase(); var - i, - j, - k + i; + var j; + var k ; var - minute = -1, - hour = -1, - day = -1, - month = -1, - year = -1 + minute = -1; + var hour = -1; + var day = -1; + var month = -1; + var year = -1 ; var isAm; @@ -1745,12 +1745,12 @@ var isDateOnly = settings.type.indexOf('time') < 0; var - words = text.split(settings.regExp.dateWords), - word + words = text.split(settings.regExp.dateWords); + var word ; var - numbers = text.split(settings.regExp.dateNumbers), - number + numbers = text.split(settings.regExp.dateNumbers); + var number ; var parts; diff --git a/src/definitions/modules/checkbox.js b/src/definitions/modules/checkbox.js index 875f2cd71e..c3910b5273 100644 --- a/src/definitions/modules/checkbox.js +++ b/src/definitions/modules/checkbox.js @@ -21,41 +21,41 @@ $.fn.checkbox = function (parameters) { var - $allModules = $(this), + $allModules = $(this); - time = Date.now(), - performance = [], + var time = Date.now(); + var performance = []; - query = arguments[0], - methodInvoked = typeof query === 'string', - queryArguments = [].slice.call(arguments, 1), - returnedValue + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var returnedValue ; $allModules.each(function () { var - settings = $.extend(true, {}, $.fn.checkbox.settings, parameters), + settings = $.extend(true, {}, $.fn.checkbox.settings, parameters); - className = settings.className, - namespace = settings.namespace, - selector = settings.selector, - error = settings.error, + var className = settings.className; + var namespace = settings.namespace; + var selector = settings.selector; + var error = settings.error; - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; - $module = $(this), - $label = $(this).children(selector.label), - $input = $(this).children(selector.input), - input = $input[0], + var $module = $(this); + var $label = $(this).children(selector.label); + var $input = $(this).children(selector.input); + var input = $input[0]; - initialLoad = false, - shortcutPressed = false, - instance = $module.data(moduleNamespace), + var initialLoad = false; + var shortcutPressed = false; + var instance = $module.data(moduleNamespace); - observer, - element = this, - module + var observer; + var element = this; + var module ; module = { @@ -197,23 +197,23 @@ }, keydown: function (event) { var - key = event.which, - keyCode = { - enter: 13, - space: 32, - escape: 27, - left: 37, - up: 38, - right: 39, - down: 40, - } + key = event.which; + var keyCode = { + enter: 13, + space: 32, + escape: 27, + left: 37, + up: 38, + right: 39, + down: 40, + } ; var - r = module.get.radios().not(selector.disabled), - rIndex = r.index($module), - rLen = r.length, - checkIndex = false + r = module.get.radios().not(selector.disabled); + var rIndex = r.index($module); + var rLen = r.length; + var checkIndex = false ; if (key === keyCode.left || key === keyCode.up) { @@ -228,9 +228,9 @@ return false; } - var nextOption = $(r[checkIndex]), - nextInput = nextOption.children(selector.input), - disallowOption = nextOption.hasClass(className.readOnly) || nextInput.prop('readonly'); + var nextOption = $(r[checkIndex]); + var nextInput = nextOption.children(selector.input); + var disallowOption = nextOption.hasClass(className.readOnly) || nextInput.prop('readonly'); if (disallowOption || settings.beforeChecked.apply(nextInput[0]) === false) { module.verbose('Next option should not allow check, cancelling key navigation'); @@ -707,9 +707,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -730,8 +730,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -755,10 +755,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js index 6fa3d310c8..71ffeeb98e 100755 --- a/src/definitions/modules/dimmer.js +++ b/src/definitions/modules/dimmer.js @@ -21,43 +21,43 @@ $.fn.dimmer = function (parameters) { var - $allModules = $(this), + $allModules = $(this); - time = Date.now(), - performance = [], + var time = Date.now(); + var performance = []; - query = arguments[0], - methodInvoked = typeof query === 'string', - queryArguments = [].slice.call(arguments, 1), + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); - returnedValue + var returnedValue ; $allModules.each(function () { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.dimmer.settings, parameters) - : $.extend({}, $.fn.dimmer.settings), + : $.extend({}, $.fn.dimmer.settings); - selector = settings.selector, - namespace = settings.namespace, - className = settings.className, - error = settings.error, + var selector = settings.selector; + var namespace = settings.namespace; + var className = settings.className; + var error = settings.error; - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; - clickEvent = 'ontouchstart' in document.documentElement - ? 'touchstart' - : 'click', + var clickEvent = 'ontouchstart' in document.documentElement + ? 'touchstart' + : 'click'; - $module = $(this), - $dimmer, - $dimmable, + var $module = $(this); + var $dimmer; + var $dimmable; - element = this, - instance = $module.data(moduleNamespace), - module + var element = this; + var instance = $module.data(moduleNamespace); + var module ; module = { @@ -395,9 +395,9 @@ set: { opacity: function (opacity) { var - color = $dimmer.css('background-color'), - colorArray = color.split(','), - isRGB = colorArray && colorArray.length >= 3 + color = $dimmer.css('background-color'); + var colorArray = color.split(','); + var isRGB = colorArray && colorArray.length >= 3 ; opacity = settings.opacity === 0 ? 0 : settings.opacity || opacity; if (isRGB) { @@ -511,9 +511,9 @@ performance: { log: function (message) { var - currentTime, - executionTime, - previousTime + currentTime; + var executionTime; + var previousTime ; if (settings.performance) { currentTime = Date.now(); @@ -534,8 +534,8 @@ }, display: function () { var - title = settings.name + ':', - totalTime = 0 + title = settings.name + ':'; + var totalTime = 0 ; time = false; clearTimeout(module.performance.timer); @@ -562,10 +562,10 @@ }, invoke: function (query, passedArguments, context) { var - object = instance, - maxDepth, - found, - response + object = instance; + var maxDepth; + var found; + var response ; passedArguments = passedArguments || queryArguments; context = context || element; @@ -709,8 +709,8 @@ template: { dimmer: function (settings) { var - d = $('
').addClass('ui dimmer'), - l + d = $('
').addClass('ui dimmer'); + var l ; if (settings.displayLoader) { l = $('
') diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index b36543ff6b..de89f42dcd 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -21,89 +21,89 @@ $.fn.dropdown = function (parameters) { var - $allModules = $(this), - $document = $(document), - - 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 = $(context); - } else { - $context = $(win.document).find(context); - if ($context.length === 0) { - $context = win.frameElement ? contextCheck(context, win.parent) : window; - } + $allModules = $(this); + var $document = $(document); + + var time = Date.now(); + var performance = []; + + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var contextCheck = function (context, win) { + var $context; + if ([window, document].indexOf(context) >= 0) { + $context = $(context); + } else { + $context = $(win.document).find(context); + if ($context.length === 0) { + $context = win.frameElement ? contextCheck(context, win.parent) : window; } + } - return $context; - }, - returnedValue + return $context; + }; + var returnedValue ; $allModules.each(function (elementIndex) { var settings = $.isPlainObject(parameters) ? $.extend(true, {}, $.fn.dropdown.settings, parameters) - : $.extend({}, $.fn.dropdown.settings), - - className = settings.className, - message = settings.message, - fields = settings.fields, - keys = settings.keys, - metadata = settings.metadata, - namespace = settings.namespace, - regExp = settings.regExp, - selector = settings.selector, - error = settings.error, - templates = settings.templates, - - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, - - $module = $(this), - $context = contextCheck(settings.context, window), - $text = $module.find(selector.text), - $search = $module.find(selector.search), - $sizer = $module.find(selector.sizer), - $input = $module.find(selector.input), - $icon = $module.find(selector.icon), - $clear = $module.find(selector.clearIcon), - - $combo = $module.prev().find(selector.text).length > 0 - ? $module.prev().find(selector.text) - : $module.prev(), - - $menu = $module.children(selector.menu), - $item = $menu.find(selector.item), - $divider = settings.hideDividers - ? $item.parent().children(selector.divider) - : $(), - - activated = false, - itemActivated = false, - internalChange = false, - iconClicked = false, - element = this, - focused = false, - instance = $module.data(moduleNamespace), - - selectActionActive, - initialLoad, - pageLostFocus, - willRefocus, - elementNamespace, - id, - selectObserver, - menuObserver, - classObserver, - module, - tempDisableApiCache = false + : $.extend({}, $.fn.dropdown.settings); + + var className = settings.className; + var message = settings.message; + var fields = settings.fields; + var keys = settings.keys; + var metadata = settings.metadata; + var namespace = settings.namespace; + var regExp = settings.regExp; + var selector = settings.selector; + var error = settings.error; + var templates = settings.templates; + + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; + + var $module = $(this); + var $context = contextCheck(settings.context, window); + var $text = $module.find(selector.text); + var $search = $module.find(selector.search); + var $sizer = $module.find(selector.sizer); + var $input = $module.find(selector.input); + var $icon = $module.find(selector.icon); + var $clear = $module.find(selector.clearIcon); + + var $combo = $module.prev().find(selector.text).length > 0 + ? $module.prev().find(selector.text) + : $module.prev(); + + var $menu = $module.children(selector.menu); + var $item = $menu.find(selector.item); + var $divider = settings.hideDividers + ? $item.parent().children(selector.divider) + : $(); + + var activated = false; + var itemActivated = false; + var internalChange = false; + var iconClicked = false; + var element = this; + var focused = false; + var instance = $module.data(moduleNamespace); + + var selectActionActive; + var initialLoad; + var pageLostFocus; + var willRefocus; + var elementNamespace; + var id; + var selectObserver; + var menuObserver; + var classObserver; + var module; + var tempDisableApiCache = false ; module = { @@ -231,9 +231,9 @@ }, userChoice: function (values) { var - $userChoices, - $userChoice, - html + $userChoices; + var $userChoice; + var html ; values = values || module.get.userValues(); if (!values) { @@ -318,9 +318,9 @@ nextAvailable: function ($selected) { $selected = $selected.eq(0); var - $nextAvailable = $selected.nextAll(selector.item).not(selector.unselectable).eq(0), - $prevAvailable = $selected.prevAll(selector.item).not(selector.unselectable).eq(0), - hasNext = $nextAvailable.length > 0 + $nextAvailable = $selected.nextAll(selector.item).not(selector.unselectable).eq(0); + var $prevAvailable = $selected.prevAll(selector.item).not(selector.unselectable).eq(0); + var hasNext = $nextAvailable.length > 0 ; if (hasNext) { module.verbose('Moving selection to', $nextAvailable); @@ -456,8 +456,8 @@ }, returnedObject: function () { var - $firstModules = $allModules.slice(0, elementIndex), - $lastModules = $allModules.slice(elementIndex + 1) + $firstModules = $allModules.slice(0, elementIndex); + var $lastModules = $allModules.slice(elementIndex + 1) ; // adjust all modules to use the correct reference $allModules = $firstModules.add($module).add($lastModules); @@ -737,42 +737,42 @@ var searchTerm = query !== undefined ? query - : module.get.query(), - afterFiltered = function () { - if (module.is.multiple()) { - module.filterActive(); - } - if (query || (!query && module.get.activeItem().length === 0)) { - module.select.firstUnfiltered(); - } - if (module.has.allResultsFiltered()) { - if (settings.onNoResults.call(element, searchTerm)) { - if (settings.allowAdditions) { - if (settings.hideAdditions) { - module.verbose('User addition with no menu, setting empty style'); - module.set.empty(); - module.hideMenu(); - } - } else { - module.verbose('All items filtered, showing message', searchTerm); - module.add.message(message.noResults); + : module.get.query(); + var afterFiltered = function () { + if (module.is.multiple()) { + module.filterActive(); + } + if (query || (!query && module.get.activeItem().length === 0)) { + module.select.firstUnfiltered(); + } + if (module.has.allResultsFiltered()) { + if (settings.onNoResults.call(element, searchTerm)) { + if (settings.allowAdditions) { + if (settings.hideAdditions) { + module.verbose('User addition with no menu, setting empty style'); + module.set.empty(); + module.hideMenu(); } } else { - module.verbose('All items filtered, hiding dropdown', searchTerm); - module.set.empty(); - module.hideMenu(); + module.verbose('All items filtered, showing message', searchTerm); + module.add.message(message.noResults); } } else { - module.remove.empty(); - module.remove.message(); - } - if (settings.allowAdditions) { - module.add.userSuggestion(module.escape.htmlEntities(query)); - } - if (module.is.searchSelection() && module.can.show() && module.is.focusedOnSearch() && !module.is.empty()) { - module.show(); + module.verbose('All items filtered, hiding dropdown', searchTerm); + module.set.empty(); + module.hideMenu(); } + } else { + module.remove.empty(); + module.remove.message(); + } + if (settings.allowAdditions) { + module.add.userSuggestion(module.escape.htmlEntities(query)); + } + if (module.is.searchSelection() && module.can.show() && module.is.focusedOnSearch() && !module.is.empty()) { + module.show(); } + } ; if (settings.useLabels && module.has.maxSelections()) { module.show(); @@ -820,55 +820,55 @@ urlData: { query: query, }, + }; + var apiCallbacks = { + onError: function (errorMessage, $module, xhr) { + module.add.message(message.serverError); + iconClicked = false; + focused = false; + callback.apply(null, callbackParameters); + if (typeof settings.apiSettings.onError === 'function') { + settings.apiSettings.onError.call(this, errorMessage, $module, xhr); + } }, - apiCallbacks = { - onError: function (errorMessage, $module, xhr) { - module.add.message(message.serverError); - iconClicked = false; - focused = false; - callback.apply(null, callbackParameters); - if (typeof settings.apiSettings.onError === 'function') { - settings.apiSettings.onError.call(this, errorMessage, $module, xhr); - } - }, - onFailure: function (response, $module, xhr) { - module.add.message(message.serverError); - iconClicked = false; - focused = false; - callback.apply(null, callbackParameters); - if (typeof settings.apiSettings.onFailure === 'function') { - settings.apiSettings.onFailure.call(this, response, $module, xhr); - } - }, - onSuccess: function (response, $module, xhr) { - var - values = response[fields.remoteValues] + onFailure: function (response, $module, xhr) { + module.add.message(message.serverError); + iconClicked = false; + focused = false; + callback.apply(null, callbackParameters); + if (typeof settings.apiSettings.onFailure === 'function') { + settings.apiSettings.onFailure.call(this, response, $module, xhr); + } + }, + onSuccess: function (response, $module, xhr) { + var + values = response[fields.remoteValues] ; - if (!Array.isArray(values)) { - values = []; - } - module.remove.message(); - var menuConfig = {}; - menuConfig[fields.values] = values; - module.setup.menu(menuConfig); + if (!Array.isArray(values)) { + values = []; + } + module.remove.message(); + var menuConfig = {}; + menuConfig[fields.values] = values; + module.setup.menu(menuConfig); - if (values.length === 0 && !settings.allowAdditions) { - module.add.message(message.noResults); - } else { - var value = module.is.multiple() ? module.get.values() : module.get.value(); - if (value !== '') { - module.verbose('Value(s) present after click icon, select value(s) in items'); - module.set.selected(value, null, true, true); - } - } - iconClicked = false; - focused = false; - callback.apply(null, callbackParameters); - if (typeof settings.apiSettings.onSuccess === 'function') { - settings.apiSettings.onSuccess.call(this, response, $module, xhr); + if (values.length === 0 && !settings.allowAdditions) { + module.add.message(message.noResults); + } else { + var value = module.is.multiple() ? module.get.values() : module.get.value(); + if (value !== '') { + module.verbose('Value(s) present after click icon, select value(s) in items'); + module.set.selected(value, null, true, true); } - }, - } + } + iconClicked = false; + focused = false; + callback.apply(null, callbackParameters); + if (typeof settings.apiSettings.onSuccess === 'function') { + settings.apiSettings.onSuccess.call(this, response, $module, xhr); + } + }, + } ; if (!$module.api('get request')) { module.setup.api(); @@ -887,12 +887,12 @@ query !== undefined ? query : module.get.query() - ), - results = null, - escapedTerm = module.escape.string(searchTerm), - regExpIgnore = settings.ignoreSearchCase ? 'i' : '', - regExpFlags = regExpIgnore + 'gm', - beginsWithRegExp = new RegExp('^' + escapedTerm, regExpFlags) + ); + var results = null; + var escapedTerm = module.escape.string(searchTerm); + var regExpIgnore = settings.ignoreSearchCase ? 'i' : ''; + var regExpFlags = regExpIgnore + 'gm'; + var beginsWithRegExp = new RegExp('^' + escapedTerm, regExpFlags) ; module.remove.filteredItem(); // avoid loop if we're matching nothing @@ -903,9 +903,9 @@ $item .each(function () { var - $choice = $(this), - text, - value + $choice = $(this); + var text; + var value ; if ($choice.hasClass(className.unfilterable)) { results.push(this); @@ -944,21 +944,21 @@ .addClass(className.filtered) ; if (settings.highlightMatches && (settings.match === 'both' || settings.match === 'text')) { - var querySplit = query.split(''), - diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : '', - htmlReg = '(?![^<]*>)', - markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg + '(') + diacriticReg + ')', regExpIgnore), - markedReplacer = function () { - var args = [].slice.call(arguments, 1, querySplit.length * 2).map(function (x, i) { - return i & 1 ? x : '' + x + ''; // eslint-disable-line no-bitwise - }); + var querySplit = query.split(''); + var diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : ''; + var htmlReg = '(?![^<]*>)'; + var markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg + '(') + diacriticReg + ')', regExpIgnore); + var markedReplacer = function () { + var args = [].slice.call(arguments, 1, querySplit.length * 2).map(function (x, i) { + return i & 1 ? x : '' + x + ''; // eslint-disable-line no-bitwise + }); - return args.join(''); - } + return args.join(''); + } ; $.each(results, function (index, result) { - var $result = $(result), - markedHTML = module.get.choiceText($result, true) + var $result = $(result); + var markedHTML = module.get.choiceText($result, true) ; if (settings.ignoreDiacritics) { markedHTML = markedHTML.normalize('NFD'); @@ -998,8 +998,8 @@ fuzzySearch: function (query, term) { var - termLength = term.length, - queryLength = query.length + termLength = term.length; + var queryLength = query.length ; if (settings.ignoreSearchCase) { query = query.toLowerCase(); @@ -1013,8 +1013,8 @@ } for (var characterIndex = 0, nextCharacterIndex = 0; characterIndex < queryLength; characterIndex++) { var - continueSearch = false, - queryCharacter = query.charCodeAt(characterIndex) + continueSearch = false; + var queryCharacter = query.charCodeAt(characterIndex) ; while (nextCharacterIndex < termLength) { if (term.charCodeAt(nextCharacterIndex++) === queryCharacter) { @@ -1065,12 +1065,12 @@ forceSelection: function () { var - $currentlySelected = $item.not(className.filtered).filter('.' + className.selected).eq(0), - $activeItem = $item.not(className.filtered).filter('.' + className.active).eq(0), - $selectedItem = $currentlySelected.length > 0 - ? $currentlySelected - : $activeItem, - hasSelected = $selectedItem.length > 0 + $currentlySelected = $item.not(className.filtered).filter('.' + className.selected).eq(0); + var $activeItem = $item.not(className.filtered).filter('.' + className.active).eq(0); + var $selectedItem = $currentlySelected.length > 0 + ? $currentlySelected + : $activeItem; + var hasSelected = $selectedItem.length > 0 ; if (settings.allowAdditions || (hasSelected && !module.is.multiple())) { module.debug('Forcing partial selection to selected item', $selectedItem); @@ -1105,11 +1105,11 @@ $input.append(''); $.each(values, function (index, item) { var - value = settings.templates.escape(item[fields.value]), - name = settings.templates.escape( - item[fields.name] || '', - settings - ) + value = settings.templates.escape(item[fields.value]); + var name = settings.templates.escape( + item[fields.name] || '', + settings + ) ; $input.append(''); }); @@ -1121,9 +1121,9 @@ event: { paste: function (event) { var - pasteValue = (event.originalEvent.clipboardData || window.clipboardData).getData('text'), - tokens = pasteValue.split(settings.delimiter), - notFoundTokens = [] + pasteValue = (event.originalEvent.clipboardData || window.clipboardData).getData('text'); + var tokens = pasteValue.split(settings.delimiter); + var notFoundTokens = [] ; tokens.forEach(function (value) { if (module.set.selected(module.escape.htmlEntities(value.trim()), null, false, true) === false) { @@ -1132,12 +1132,12 @@ }); event.preventDefault(); if (notFoundTokens.length > 0) { - var searchEl = $search[0], - startPos = searchEl.selectionStart, - endPos = searchEl.selectionEnd, - orgText = searchEl.value, - pasteText = notFoundTokens.join(settings.delimiter), - newEndPos = startPos + pasteText.length + var searchEl = $search[0]; + var startPos = searchEl.selectionStart; + var endPos = searchEl.selectionEnd; + var orgText = searchEl.value; + var pasteText = notFoundTokens.join(settings.delimiter); + var newEndPos = startPos + pasteText.length ; $search.val(orgText.slice(0, startPos) + pasteText + orgText.slice(endPos)); searchEl.selectionStart = newEndPos; @@ -1269,14 +1269,14 @@ label: { click: function (event) { var - $label = $(this), - $labels = $module.find(selector.label), - $activeLabels = $labels.filter('.' + className.active), - $nextActive = $label.nextAll('.' + className.active), - $prevActive = $label.prevAll('.' + className.active), - $range = $nextActive.length > 0 - ? $label.nextUntil($nextActive).add($activeLabels).add($label) - : $label.prevUntil($prevActive).add($activeLabels).add($label) + $label = $(this); + var $labels = $module.find(selector.label); + var $activeLabels = $labels.filter('.' + className.active); + var $nextActive = $label.nextAll('.' + className.active); + var $prevActive = $label.prevAll('.' + className.active); + var $range = $nextActive.length > 0 + ? $label.nextUntil($nextActive).add($activeLabels).add($label) + : $label.prevUntil($prevActive).add($activeLabels).add($label) ; if (event.shiftKey) { $activeLabels.removeClass(className.active); @@ -1357,16 +1357,16 @@ menu: { mutation: function (mutations) { var - mutation = mutations[0], - $addedNode = mutation.addedNodes - ? $(mutation.addedNodes[0]) - : $(false), - $removedNode = mutation.removedNodes - ? $(mutation.removedNodes[0]) - : $(false), - $changedNodes = $addedNode.add($removedNode), - isUserAddition = $changedNodes.is(selector.addition) || $changedNodes.closest(selector.addition).length > 0, - isMessage = $changedNodes.is(selector.message) || $changedNodes.closest(selector.message).length > 0 + mutation = mutations[0]; + var $addedNode = mutation.addedNodes + ? $(mutation.addedNodes[0]) + : $(false); + var $removedNode = mutation.removedNodes + ? $(mutation.removedNodes[0]) + : $(false); + var $changedNodes = $addedNode.add($removedNode); + var isUserAddition = $changedNodes.is(selector.addition) || $changedNodes.closest(selector.addition).length > 0; + var isMessage = $changedNodes.is(selector.message) || $changedNodes.closest(selector.message).length > 0 ; if (isUserAddition || isMessage) { module.debug('Updating item selector cache'); @@ -1386,12 +1386,12 @@ item: { mouseenter: function (event) { var - $target = $(event.target), - $item = $(this), - $subMenu = $item.children(selector.menu), - $otherMenus = $item.siblings(selector.item).children(selector.menu), - hasSubMenu = $subMenu.length > 0, - isBubbledEvent = $subMenu.find($target).length > 0 + $target = $(event.target); + var $item = $(this); + var $subMenu = $item.children(selector.menu); + var $otherMenus = $item.siblings(selector.item).children(selector.menu); + var hasSubMenu = $subMenu.length > 0; + var isBubbledEvent = $subMenu.find($target).length > 0 ; if (!isBubbledEvent && hasSubMenu) { clearTimeout(module.itemTimer); @@ -1421,15 +1421,15 @@ }, click: function (event, skipRefocus) { var - $choice = $(this), - $target = event - ? $(event.target || '') - : $(''), - $subMenu = $choice.find(selector.menu), - text = module.get.choiceText($choice), - value = module.get.choiceValue($choice, text), - hasSubMenu = $subMenu.length > 0, - isBubbledEvent = $subMenu.find($target).length > 0 + $choice = $(this); + var $target = event + ? $(event.target || '') + : $(''); + var $subMenu = $choice.find(selector.menu); + var text = module.get.choiceText($choice); + var value = module.get.choiceValue($choice, text); + var hasSubMenu = $subMenu.length > 0; + var isBubbledEvent = $subMenu.find($target).length > 0 ; if (document.activeElement.tagName.toLowerCase() !== 'input') { $(document.activeElement).trigger('blur'); @@ -1465,25 +1465,25 @@ // label selection should occur even when the element has no focus keydown: function (event) { var - pressedKey = event.which, - isShortcutKey = module.is.inObject(pressedKey, keys) + pressedKey = event.which; + var isShortcutKey = module.is.inObject(pressedKey, keys) ; if (isShortcutKey) { var - $label = $module.find(selector.label), - $activeLabel = $label.filter('.' + className.active), - activeValue = $activeLabel.data(metadata.value), - labelIndex = $label.index($activeLabel), - labelCount = $label.length, - hasActiveLabel = $activeLabel.length > 0, - hasMultipleActive = $activeLabel.length > 1, - isFirstLabel = labelIndex === 0, - isLastLabel = labelIndex + 1 === labelCount, - isSearch = module.is.searchSelection(), - isFocusedOnSearch = module.is.focusedOnSearch(), - isFocused = module.is.focused(), - caretAtStart = isFocusedOnSearch && module.get.caretPosition(false) === 0, - isSelectedSearch = caretAtStart && module.get.caretPosition(true) !== 0 + $label = $module.find(selector.label); + var $activeLabel = $label.filter('.' + className.active); + var activeValue = $activeLabel.data(metadata.value); + var labelIndex = $label.index($activeLabel); + var labelCount = $label.length; + var hasActiveLabel = $activeLabel.length > 0; + var hasMultipleActive = $activeLabel.length > 1; + var isFirstLabel = labelIndex === 0; + var isLastLabel = labelIndex + 1 === labelCount; + var isSearch = module.is.searchSelection(); + var isFocusedOnSearch = module.is.focusedOnSearch(); + var isFocused = module.is.focused(); + var caretAtStart = isFocusedOnSearch && module.get.caretPosition(false) === 0; + var isSelectedSearch = caretAtStart && module.get.caretPosition(true) !== 0 ; if (isSearch && !hasActiveLabel && !isFocusedOnSearch) { return; @@ -1584,29 +1584,29 @@ keydown: function (event) { var - pressedKey = event.which, - isShortcutKey = module.is.inObject(pressedKey, keys) || event.key === settings.delimiter + pressedKey = event.which; + var isShortcutKey = module.is.inObject(pressedKey, keys) || event.key === settings.delimiter ; if (isShortcutKey) { var - $currentlySelected = $item.not(selector.unselectable).filter('.' + className.selected).eq(0), - $activeItem = $menu.children('.' + className.active).eq(0), - $selectedItem = $currentlySelected.length > 0 - ? $currentlySelected - : $activeItem, - $visibleItems = $selectedItem.length > 0 - ? $selectedItem.siblings(':not(.' + className.filtered + ')').addBack() - : $menu.children(':not(.' + className.filtered + ')'), - $subMenu = $selectedItem.children(selector.menu), - $parentMenu = $selectedItem.closest(selector.menu), - inVisibleMenu = $parentMenu.hasClass(className.visible) || $parentMenu.hasClass(className.animating) || $parentMenu.parent(selector.menu).length > 0, - hasSubMenu = $subMenu.length > 0, - hasSelectedItem = $selectedItem.length > 0, - selectedIsSelectable = $selectedItem.not(selector.unselectable).length > 0, - delimiterPressed = event.key === settings.delimiter && module.is.multiple(), - isAdditionWithoutMenu = settings.allowAdditions && (pressedKey === keys.enter || delimiterPressed), - $nextItem, - isSubMenuItem + $currentlySelected = $item.not(selector.unselectable).filter('.' + className.selected).eq(0); + var $activeItem = $menu.children('.' + className.active).eq(0); + var $selectedItem = $currentlySelected.length > 0 + ? $currentlySelected + : $activeItem; + var $visibleItems = $selectedItem.length > 0 + ? $selectedItem.siblings(':not(.' + className.filtered + ')').addBack() + : $menu.children(':not(.' + className.filtered + ')'); + var $subMenu = $selectedItem.children(selector.menu); + var $parentMenu = $selectedItem.closest(selector.menu); + var inVisibleMenu = $parentMenu.hasClass(className.visible) || $parentMenu.hasClass(className.animating) || $parentMenu.parent(selector.menu).length > 0; + var hasSubMenu = $subMenu.length > 0; + var hasSelectedItem = $selectedItem.length > 0; + var selectedIsSelectable = $selectedItem.not(selector.unselectable).length > 0; + var delimiterPressed = event.key === settings.delimiter && module.is.multiple(); + var isAdditionWithoutMenu = settings.allowAdditions && (pressedKey === keys.enter || delimiterPressed); + var $nextItem; + var isSubMenuItem ; // allow selection with the menu closed if (isAdditionWithoutMenu) { @@ -1802,9 +1802,9 @@ }, eventInModule: function (event, callback) { var - $target = $(event.target), - inDocument = $target.closest(document.documentElement).length > 0, - inModule = $target.closest($module).length > 0 + $target = $(event.target); + var inDocument = $target.closest(document.documentElement).length > 0; + var inModule = $target.closest($module).length > 0 ; callback = isFunction(callback) ? callback @@ -1822,11 +1822,11 @@ }, eventOnElement: function (event, callback) { var - $target = $(event.target), - $label = $target.closest(selector.siblingLabel), - inVisibleDOM = document.body.contains(event.target), - notOnLabel = $module.find($label).length === 0 || !(module.is.multiple() && settings.useLabels), - notInMenu = $target.closest($menu).length === 0 + $target = $(event.target); + var $label = $target.closest(selector.siblingLabel); + var inVisibleDOM = document.body.contains(event.target); + var notOnLabel = $module.find($label).length === 0 || !(module.is.multiple() && settings.useLabels); + var notInMenu = $target.closest($menu).length === 0 ; callback = isFunction(callback) ? callback @@ -1921,8 +1921,8 @@ }, selectionCount: function () { var - values = module.get.values(), - count + values = module.get.values(); + var count ; count = module.is.multiple() ? (Array.isArray(values) ? values.length : 0) @@ -1957,9 +1957,9 @@ }, caretPosition: function (returnEndPos) { var - input = $search[0], - range, - rangeLength + input = $search[0]; + var range; + var rangeLength ; if (returnEndPos && 'selectionEnd' in input) { return input.selectionEnd; @@ -1983,8 +1983,8 @@ var value = $input.length > 0 ? $input.val() - : $module.data(metadata.value), - isEmptyMultiselect = Array.isArray(value) && value.length === 1 && value[0] === '' + : $module.data(metadata.value); + var isEmptyMultiselect = Array.isArray(value) && value.length === 1 && value[0] === '' ; // prevents the placeholder element from being selected when multiple @@ -2010,8 +2010,8 @@ }, remoteValues: function () { var - values = module.get.values(), - remoteValues = false + values = module.get.values(); + var remoteValues = false ; if (values) { if (typeof values === 'string') { @@ -2084,24 +2084,24 @@ }, selectValues: function () { var - select = {}, - oldGroup = [], - values = [] + select = {}; + var oldGroup = []; + var values = [] ; $module .find('option') .each(function () { var - $option = $(this), - name = $option.html(), - disabled = $option.attr('disabled'), - value = $option.attr('value') !== undefined - ? $option.attr('value') - : name, - text = $option.data(metadata.text) !== undefined - ? $option.data(metadata.text) - : name, - group = $option.parent('optgroup') + $option = $(this); + var name = $option.html(); + var disabled = $option.attr('disabled'); + var value = $option.attr('value') !== undefined + ? $option.attr('value') + : name; + var text = $option.data(metadata.text) !== undefined + ? $option.data(metadata.text) + : name; + var group = $option.parent('optgroup') ; if (settings.placeholder === 'auto' && value === '') { select.placeholder = name; @@ -2162,9 +2162,9 @@ }, itemWithAdditions: function (value) { var - $items = module.get.item(value), - $userItems = module.create.userChoice(value), - hasUserItems = $userItems && $userItems.length > 0 + $items = module.get.item(value); + var $userItems = module.create.userChoice(value); + var hasUserItems = $userItems && $userItems.length > 0 ; if (hasUserItems) { $items = $items.length > 0 @@ -2176,9 +2176,9 @@ }, item: function (value, strict) { var - $selectedItem = false, - shouldSearch, - isMultiple + $selectedItem = false; + var shouldSearch; + var isMultiple ; value = value !== undefined ? value @@ -2196,9 +2196,9 @@ $item .each(function () { var - $choice = $(this), - optionText = module.get.choiceText($choice), - optionValue = module.get.choiceValue($choice, optionText) + $choice = $(this); + var optionText = module.get.choiceText($choice); + var optionValue = module.get.choiceValue($choice, optionText) ; // safe early exit if (optionValue === null || optionValue === undefined) { @@ -2281,8 +2281,8 @@ }, defaultText: function () { var - defaultText = module.get.defaultText(), - placeholderText = module.get.placeholderText + defaultText = module.get.defaultText(); + var placeholderText = module.get.placeholderText ; if (defaultText === placeholderText) { module.debug('Restoring default placeholder text', defaultText); @@ -2447,19 +2447,19 @@ scrollPage: function (direction, $selectedItem) { var - $currentItem = $selectedItem || module.get.selectedItem(), - $menu = $currentItem.closest(selector.menu), - menuHeight = $menu.outerHeight(), - currentScroll = $menu.scrollTop(), - itemHeight = $item.eq(0).outerHeight(), - itemsPerPage = Math.floor(menuHeight / itemHeight), - newScroll = direction === 'up' - ? currentScroll - (itemHeight * itemsPerPage) - : currentScroll + (itemHeight * itemsPerPage), - $selectableItem = $item.not(selector.unselectable), - isWithinRange, - $nextSelectedItem, - elementIndex + $currentItem = $selectedItem || module.get.selectedItem(); + var $menu = $currentItem.closest(selector.menu); + var menuHeight = $menu.outerHeight(); + var currentScroll = $menu.scrollTop(); + var itemHeight = $item.eq(0).outerHeight(); + var itemsPerPage = Math.floor(menuHeight / itemHeight); + var newScroll = direction === 'up' + ? currentScroll - (itemHeight * itemsPerPage) + : currentScroll + (itemHeight * itemsPerPage); + var $selectableItem = $item.not(selector.unselectable); + var isWithinRange; + var $nextSelectedItem; + var elementIndex ; elementIndex = direction === 'up' ? $selectableItem.index($currentItem) - itemsPerPage @@ -2492,15 +2492,15 @@ set: { filtered: function () { var - isMultiple = module.is.multiple(), - isSearch = module.is.searchSelection(), - isSearchMultiple = isMultiple && isSearch, - searchValue = isSearch - ? module.get.query() - : '', - hasSearchValue = typeof searchValue === 'string' && searchValue.length > 0, - searchWidth = module.get.searchWidth(), - valueIsSet = searchValue !== '' + isMultiple = module.is.multiple(); + var isSearch = module.is.searchSelection(); + var isSearchMultiple = isMultiple && isSearch; + var searchValue = isSearch + ? module.get.query() + : ''; + var hasSearchValue = typeof searchValue === 'string' && searchValue.length > 0; + var searchWidth = module.get.searchWidth(); + var valueIsSet = searchValue !== '' ; if (isMultiple && hasSearchValue) { module.verbose('Adjusting input width', searchWidth); @@ -2568,16 +2568,16 @@ }, scrollPosition: function ($item, forceScroll) { var - edgeTolerance = 5, - $menu, - hasActive, - offset, - itemOffset, - menuOffset, - menuScroll, - menuHeight, - abovePage, - belowPage + edgeTolerance = 5; + var $menu; + var hasActive; + var offset; + var itemOffset; + var menuOffset; + var menuScroll; + var menuHeight; + var abovePage; + var belowPage ; $item = $item || module.get.selectedItem(); @@ -2634,9 +2634,9 @@ }, selectedItem: function ($item) { var - value = module.get.choiceValue($item), - searchText = module.get.choiceText($item, false), - text = module.get.choiceText($item) + value = module.get.choiceValue($item); + var searchText = module.get.choiceText($item, false); + var text = module.get.choiceText($item) ; module.debug('Setting user selection to item', $item); module.remove.activeItem(); @@ -2647,10 +2647,10 @@ }, selectedLetter: function (letter) { var - $selectedItem = $item.filter('.' + className.selected), - alreadySelectedLetter = $selectedItem.length > 0 && module.has.firstLetter($selectedItem, letter), - $nextValue = false, - $nextItem + $selectedItem = $item.filter('.' + className.selected); + var alreadySelectedLetter = $selectedItem.length > 0 && module.has.firstLetter($selectedItem, letter); + var $nextValue = false; + var $nextItem ; // check next of the same letter if (alreadySelectedLetter) { @@ -2724,12 +2724,12 @@ $input.addClass(className.noselection); } var - escapedValue = module.escape.value(value), - hasInput = $input.length > 0, - currentValue = module.get.values(), - stringValue = value !== undefined - ? String(value) - : value + escapedValue = module.escape.value(value); + var hasInput = $input.length > 0; + var currentValue = module.get.values(); + var stringValue = value !== undefined + ? String(value) + : value ; if (hasInput) { if (!settings.allowReselection && stringValue == currentValue) { @@ -2823,15 +2823,15 @@ $selectedItem .each(function () { var - $selected = $(this), - selectedText = module.get.choiceText($selected), - selectedValue = module.get.choiceValue($selected, selectedText), - - isFiltered = $selected.hasClass(className.filtered), - isActive = $selected.hasClass(className.active), - isActionable = $selected.hasClass(className.actionable), - isUserValue = $selected.hasClass(className.addition), - shouldAnimate = isMultiple && $selectedItem && $selectedItem.length === 1 + $selected = $(this); + var selectedText = module.get.choiceText($selected); + var selectedValue = module.get.choiceValue($selected, selectedText); + + var isFiltered = $selected.hasClass(className.filtered); + var isActive = $selected.hasClass(className.active); + var isActionable = $selected.hasClass(className.actionable); + var isUserValue = $selected.hasClass(className.addition); + var shouldAnimate = isMultiple && $selectedItem && $selectedItem.length === 1 ; if (isActionable) { if ((!isMultiple || (!isActive || isUserValue)) && settings.apiSettings && settings.saveRemoteData) { @@ -2888,9 +2888,9 @@ var $next = module.is.searchSelection() ? $search - : $text, - escapedValue = module.escape.value(value), - $label + : $text; + var escapedValue = module.escape.value(value); + var $label ; if (settings.ignoreCase) { escapedValue = escapedValue.toLowerCase(); @@ -2932,8 +2932,8 @@ }, message: function (message) { var - $message = $menu.children(selector.message), - html = settings.templates.message(module.add.variables(message)) + $message = $menu.children(selector.message); + var html = settings.templates.message(module.add.variables(message)) ; if ($message.length > 0) { $message @@ -2949,9 +2949,9 @@ }, optionValue: function (value) { var - escapedValue = module.escape.value(value), - $option = $input.find('option[value="' + module.escape.string(escapedValue) + '"]'), - hasOption = $option.length > 0 + escapedValue = module.escape.value(value); + var $option = $input.find('option[value="' + module.escape.string(escapedValue) + '"]'); + var hasOption = $option.length > 0 ; if (hasOption) { return; @@ -2973,11 +2973,11 @@ }, userSuggestion: function (value) { var - $addition = $menu.children(selector.addition), - $existingItem = module.get.item(value), - alreadyHasValue = $existingItem && $existingItem.not(selector.addition).length > 0, - hasUserSuggestion = $addition.length > 0, - html + $addition = $menu.children(selector.addition); + var $existingItem = module.get.item(value); + var alreadyHasValue = $existingItem && $existingItem.not(selector.addition).length > 0; + var hasUserSuggestion = $addition.length > 0; + var html ; if (settings.useLabels && module.has.maxSelections()) { return; @@ -3020,10 +3020,10 @@ }, variables: function (message, term) { var - hasCount = message.search('{count}') !== -1, - hasMaxCount = message.search('{maxCount}') !== -1, - hasTerm = message.search('{term}') !== -1, - query + hasCount = message.search('{count}') !== -1; + var hasMaxCount = message.search('{maxCount}') !== -1; + var hasTerm = message.search('{term}') !== -1; + var query ; module.verbose('Adding templated variables to message', message); if (hasCount) { @@ -3046,8 +3046,8 @@ addedText = undefined; } var - currentValue = module.get.values(true), - newValue + currentValue = module.get.values(true); + var newValue ; if (module.has.value(addedValue)) { module.debug('Value already selected'); @@ -3139,9 +3139,9 @@ }, optionValue: function (value) { var - escapedValue = module.escape.value(value), - $option = $input.find('option[value="' + module.escape.string(escapedValue) + '"]'), - hasOption = $option.length > 0 + escapedValue = module.escape.value(value); + var $option = $input.find('option[value="' + module.escape.string(escapedValue) + '"]'); + var hasOption = $option.length > 0 ; if (!hasOption || !$option.hasClass(className.addition)) { return; @@ -3178,9 +3178,9 @@ $selectedItem .each(function () { var - $selected = $(this), - selectedText = module.get.choiceText($selected), - selectedValue = module.get.choiceValue($selected, selectedText) + $selected = $(this); + var selectedText = module.get.choiceText($selected); + var selectedValue = module.get.choiceValue($selected, selectedText) ; if (module.is.multiple()) { if (settings.useLabels) { @@ -3212,8 +3212,8 @@ }, value: function (removedValue, removedText, $removedItem, preventChangeTrigger) { var - values = module.get.values(true), - newValue + values = module.get.values(true); + var newValue ; if (module.has.selectInput()) { module.verbose('Input is

'; @@ -1480,8 +1480,8 @@ class: settings.className.ok, click: function () { var - settings = $this.get.settings(), - inputField = $this.get.element().find(settings.selector.prompt)[0] + settings = $this.get.settings(); + var inputField = $this.get.element().find(settings.selector.prompt)[0] ; args.handler($(inputField).val()); }, diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js index 78c6d27273..449f3a7391 100755 --- a/src/definitions/modules/modal.js +++ b/src/definitions/modules/modal.js @@ -21,80 +21,80 @@ $.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; - } + $allModules = $(this); + var $window = $(window); + var $document = $(document); + var $body = $('body'); + + var time = Date.now(); + var performance = []; + + var query = arguments[0]; + var methodInvoked = typeof query === 'string'; + var queryArguments = [].slice.call(arguments, 1); + var 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; } + } - return $context; - }, - returnedValue + return $context; + }; + var 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 + : $.extend({}, $.fn.modal.settings); + + var selector = settings.selector; + var className = settings.className; + var namespace = settings.namespace; + var fields = settings.fields; + var error = settings.error; + + var eventNamespace = '.' + namespace; + var moduleNamespace = 'module-' + namespace; + + var $module = $(this); + var $context = contextCheck(settings.context, window); + var isBody = $context[0] === $body[0]; + var $closeIcon = $module.find(selector.closeIcon); + var $inputs; + + var $allModals; + var $otherModals; + var $focusedElement; + var $dimmable; + var $dimmer; + + var isModalComponent = $module.hasClass('modal'); + + var element = this; + var instance = isModalComponent ? $module.data(moduleNamespace) : undefined; + + var ignoreRepeatedEvents = false; + + var initialMouseDownInModal; + var initialMouseDownInScrollbar; + var initialBodyMargin = ''; + var tempBodyMargin = ''; + var keepScrollingClass = false; + var hadScrollbar = false; + var windowRefocused = false; + + var elementEventNamespace; + var id; + var observer; + var observeAttributes = false; + var module ; module = { @@ -127,12 +127,12 @@ var icon = el[fields.icon] ? '' - : '', - 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 () {} + : ''; + var text = module.helpers.escape(el[fields.text] || '', settings); + var cls = module.helpers.escape(el[fields.class] || ''); + var click = el[fields.click] && isFunction(el[fields.click]) + ? el[fields.click] + : function () {} ; $actions.append($('