From: Daniel Ruf Date: Sat, 5 Oct 2019 15:38:34 +0000 (+0200) Subject: refactor: use const and let X-Git-Tag: v6.6.2^2~39^2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11831%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git refactor: use const and let --- diff --git a/customizer/lib/js.js b/customizer/lib/js.js index 2b2bd42d3..9f6779b03 100644 --- a/customizer/lib/js.js +++ b/customizer/lib/js.js @@ -1,6 +1,5 @@ -var empty = require('is-empty-object'); -var unique = require('array-uniq'); -var path = require('path'); +const empty = require('is-empty-object'); +const path = require('path'); // custom module names where needed const MODULES = { @@ -15,7 +14,7 @@ const MODULES = { */ module.exports = function(config, modules) { - var dir = path.resolve(__dirname, '../../js/'); + const dir = path.resolve(__dirname, '../../js/'); var entry = "import $ from 'jquery';\n" + "import { Foundation } from '" + dir + "/foundation.core';\n" + "Foundation.addToJquery($);\n" + @@ -26,14 +25,14 @@ module.exports = function(config, modules) { // last 2 pieces work around https://github.com/zurb/foundation-sites/issues/10287 - var libraries = []; + const libraries = []; if (empty(modules)) { modules = Object.keys(config); } - for (var i in modules) { - var name = modules[i]; + for (let i in modules) { + let name = modules[i]; // Check if the module has JS files if (config[name] && config[name].js) { @@ -42,9 +41,9 @@ module.exports = function(config, modules) { } // add plugins into entry - for (var i in libraries) { - var file = libraries[i]; - var moduleName = MODULES[file] || file.charAt(0).toUpperCase() + file.slice(1); + for (let i in libraries) { + let file = libraries[i]; + let moduleName = MODULES[file] || file.charAt(0).toUpperCase() + file.slice(1); entry = entry + "import { " + moduleName + " } from '" + dir + "/foundation." + file + "';\n"; entry = entry + "Foundation.plugin(" + moduleName + ", '" + moduleName + "');\n"; } diff --git a/customizer/lib/sass.js b/customizer/lib/sass.js index 6ee0abb2c..00b507362 100644 --- a/customizer/lib/sass.js +++ b/customizer/lib/sass.js @@ -1,8 +1,8 @@ -var empty = require('is-empty-object'); -var format = require('util').format; -var stripIndent = require('strip-indent'); +const empty = require('is-empty-object'); +const format = require('util').format; +const stripIndent = require('strip-indent'); -var SASS_TEMPLATE = stripIndent(` +const SASS_TEMPLATE = stripIndent(` @charset 'utf-8'; // Variables go here @@ -28,19 +28,19 @@ var SASS_TEMPLATE = stripIndent(` * @returns {String} Formatted Sass file. */ module.exports = function(config, modules, variables) { - var variableList = []; + const variableList = []; var colorList = {}; - var exportList = ['@include foundation-global-styles;']; + const exportList = ['@include foundation-global-styles;']; if (empty(modules)) { modules = Object.keys(config); } // Create variable overrides code - for (var i in variables) { - var name = i.replace('_', '-'); + for (let i in variables) { + let name = i.replace('_', '-'); if (name.match(/-color$/)) { - var key = name.replace('-color', ''); + let key = name.replace('-color', ''); colorList[key] = variables[i]; } else { @@ -53,8 +53,8 @@ module.exports = function(config, modules, variables) { } // Create module exports with @include - for (var i in modules) { - var name = modules[i]; + for (let i in modules) { + let name = modules[i]; if (config[name] && config[name].sass) { exportList.push(format('@include foundation-%s;', config[name].sass)); @@ -68,7 +68,7 @@ function createPaletteMap(colors) { var output = '$foundation-palette: (%s\n);'; var keys = ''; - for (var i in colors) { + for (let i in colors) { keys += format('\n %s: %s,', i, colors[i]); } diff --git a/docs/assets/img/gulpfile.js b/docs/assets/img/gulpfile.js index d90190856..28bf07f81 100755 --- a/docs/assets/img/gulpfile.js +++ b/docs/assets/img/gulpfile.js @@ -1,8 +1,8 @@ -var $ = require('gulp-load-plugins')(); -var gulp = require('gulp'); -var rimraf = require('rimraf'); -var panini = require('panini'); -var sequence = require('run-sequence'); +const $ = require('gulp-load-plugins')(); +const gulp = require('gulp'); +const rimraf = require('rimraf'); +const panini = require('panini'); +const sequence = require('run-sequence'); // Check for --production flag var isProduction = process.argv.includes('--production'); diff --git a/js/foundation.core.utils.js b/js/foundation.core.utils.js index b6778b72b..5ced8e0df 100644 --- a/js/foundation.core.utils.js +++ b/js/foundation.core.utils.js @@ -46,9 +46,9 @@ function transitionend($elem){ var elem = document.createElement('div'), end; - for (var t in transitions){ - if (typeof elem.style[t] !== 'undefined'){ - end = transitions[t]; + for (let transition in transitions){ + if (typeof elem.style[transition] !== 'undefined'){ + end = transitions[transition]; } } if(end){