From: Nicolas Coden Date: Mon, 26 Feb 2018 06:20:37 +0000 (+0100) Subject: chore: move `util.core` and `plugin` to the `core` namespace X-Git-Tag: v6.6.0~3^2~259^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87f09d712;p=thirdparty%2Ffoundation%2Ffoundation-sites.git chore: move `util.core` and `plugin` to the `core` namespace --- diff --git a/gulp/config.js b/gulp/config.js index 25a78c744..1c62f416b 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -5,7 +5,7 @@ module.exports = { JS_FILES: [ 'js/foundation.core.js', - 'js/foundation.util.core.js', + 'js/foundation.core.utils.js', 'js/foundation.util.*.js', 'js/*.js' ], diff --git a/gulp/tasks/javascript.js b/gulp/tasks/javascript.js index 8d2a6a1b4..3593daa80 100644 --- a/gulp/tasks/javascript.js +++ b/gulp/tasks/javascript.js @@ -87,7 +87,7 @@ var webpackConfig = { gulp.task('javascript', ['javascript:foundation', 'javascript:deps', 'javascript:docs']); // Core has to be dealt with slightly differently due to bootstrapping externals -// and the dependency on foundation.util.core +// and the dependency on foundation.core.utils // gulp.task('javascript:plugin-core', function() { return gulp.src('js/entries/plugins/foundation.core.js') diff --git a/js/entries/foundation-plugins.js b/js/entries/foundation-plugins.js index ee757c57f..7b10c9fb1 100644 --- a/js/entries/foundation-plugins.js +++ b/js/entries/foundation-plugins.js @@ -1,5 +1,5 @@ import { Foundation as Core } from '../foundation.core'; -import * as CoreUtils from '../foundation.util.core'; +import * as CoreUtils from '../foundation.core.utils'; import { Box } from '../foundation.util.box' import { onImagesLoaded } from '../foundation.util.imageLoader'; import { Keyboard } from '../foundation.util.keyboard'; diff --git a/js/entries/foundation.js b/js/entries/foundation.js index cc312ad18..8e7014009 100644 --- a/js/entries/foundation.js +++ b/js/entries/foundation.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { Foundation } from '../foundation.core'; -import * as CoreUtils from '../foundation.util.core'; +import * as CoreUtils from '../foundation.core.utils'; import { Box } from '../foundation.util.box' import { onImagesLoaded } from '../foundation.util.imageLoader'; import { Keyboard } from '../foundation.util.keyboard'; diff --git a/js/entries/plugins/foundation.core.js b/js/entries/plugins/foundation.core.js index 5ed3d3808..23d806b3f 100644 --- a/js/entries/plugins/foundation.core.js +++ b/js/entries/plugins/foundation.core.js @@ -6,7 +6,7 @@ Foundation.addToJquery($); // These are now separated out, but historically were a part of this module, // and since this is here for backwards compatibility we include them in // this entry. -import {rtl, GetYoDigits, transitionend, RegExpEscape} from '../../foundation.util.core'; +import { rtl, GetYoDigits, transitionend, RegExpEscape } from '../../foundation.core.utils'; Foundation.rtl = rtl; Foundation.GetYoDigits = GetYoDigits; Foundation.transitionend = transitionend; @@ -14,8 +14,7 @@ Foundation.RegExpEscape = RegExpEscape; // Every plugin depends on plugin now, we can include that on the core for the // script inclusion path. - -import { Plugin } from '../../foundation.plugin'; +import { Plugin } from '../../foundation.core.plugin'; Foundation.Plugin = Plugin; diff --git a/js/foundation.abide.js b/js/foundation.abide.js index b307f29a5..431c3988d 100644 --- a/js/foundation.abide.js +++ b/js/foundation.abide.js @@ -1,8 +1,8 @@ 'use strict'; import $ from 'jquery'; -import { Plugin } from './foundation.plugin'; -import { GetYoDigits } from './foundation.util.core'; +import { Plugin } from './foundation.core.plugin'; +import { GetYoDigits } from './foundation.core.utils'; /** * Abide module. diff --git a/js/foundation.accordion.js b/js/foundation.accordion.js index 7ec830bfe..5c918d3b3 100644 --- a/js/foundation.accordion.js +++ b/js/foundation.accordion.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; /** * Accordion module. diff --git a/js/foundation.accordionMenu.js b/js/foundation.accordionMenu.js index 2f7349498..b99c5245b 100644 --- a/js/foundation.accordionMenu.js +++ b/js/foundation.accordionMenu.js @@ -4,8 +4,8 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { Nest } from './foundation.util.nest'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; /** * AccordionMenu module. diff --git a/js/foundation.core.js b/js/foundation.core.js index b53017445..eb837dc10 100644 --- a/js/foundation.core.js +++ b/js/foundation.core.js @@ -1,7 +1,7 @@ "use strict"; import $ from 'jquery'; -import { GetYoDigits } from './foundation.util.core'; +import { GetYoDigits } from './foundation.core.utils'; import { MediaQuery } from './foundation.util.mediaQuery'; var FOUNDATION_VERSION = '6.4.3'; diff --git a/js/foundation.plugin.js b/js/foundation.core.plugin.js similarity index 96% rename from js/foundation.plugin.js rename to js/foundation.core.plugin.js index 6e1b8ab57..211e7b5e7 100644 --- a/js/foundation.plugin.js +++ b/js/foundation.core.plugin.js @@ -1,7 +1,7 @@ 'use strict'; import $ from 'jquery'; -import { GetYoDigits } from './foundation.util.core'; +import { GetYoDigits } from './foundation.core.utils'; // Abstract class for providing lifecycle hooks. Expect plugins to define AT LEAST // {function} _setup (replaces previous constructor), diff --git a/js/foundation.util.core.js b/js/foundation.core.utils.js similarity index 100% rename from js/foundation.util.core.js rename to js/foundation.core.utils.js diff --git a/js/foundation.drilldown.js b/js/foundation.drilldown.js index 5f7d2ca56..b8eb2a4e7 100644 --- a/js/foundation.drilldown.js +++ b/js/foundation.drilldown.js @@ -3,9 +3,9 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { Nest } from './foundation.util.nest'; -import { GetYoDigits, transitionend } from './foundation.util.core'; +import { GetYoDigits, transitionend } from './foundation.core.utils'; import { Box } from './foundation.util.box'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; /** * Drilldown module. diff --git a/js/foundation.dropdown.js b/js/foundation.dropdown.js index a0ca3b27e..4bc094476 100644 --- a/js/foundation.dropdown.js +++ b/js/foundation.dropdown.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; -import { GetYoDigits } from './foundation.util.core'; +import { GetYoDigits } from './foundation.core.utils'; import { Positionable } from './foundation.positionable'; import { Triggers } from './foundation.util.triggers'; @@ -427,7 +427,7 @@ Dropdown.defaults = { */ closeOnClick: false, /** - * If true the default action of the toggle (e.g. follow a link with href) gets executed on click. If hover option is also true the default action gets prevented on first click for mobile / touch devices and executed on second click. + * If true the default action of the toggle (e.g. follow a link with href) gets executed on click. If hover option is also true the default action gets prevented on first click for mobile / touch devices and executed on second click. * @option * @type {boolean} * @default true diff --git a/js/foundation.dropdownMenu.js b/js/foundation.dropdownMenu.js index 573116140..e471f4cf2 100644 --- a/js/foundation.dropdownMenu.js +++ b/js/foundation.dropdownMenu.js @@ -4,8 +4,8 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { Nest } from './foundation.util.nest'; import { Box } from './foundation.util.box'; -import { rtl as Rtl } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { rtl as Rtl } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; /** diff --git a/js/foundation.equalizer.js b/js/foundation.equalizer.js index bf4e8e548..f87714af0 100644 --- a/js/foundation.equalizer.js +++ b/js/foundation.equalizer.js @@ -3,8 +3,8 @@ import $ from 'jquery'; import { MediaQuery } from './foundation.util.mediaQuery'; import { onImagesLoaded } from './foundation.util.imageLoader'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; /** * Equalizer module. diff --git a/js/foundation.interchange.js b/js/foundation.interchange.js index 6591171bf..a12d3f9ff 100644 --- a/js/foundation.interchange.js +++ b/js/foundation.interchange.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import { MediaQuery } from './foundation.util.mediaQuery'; -import { Plugin } from './foundation.plugin'; -import { GetYoDigits } from './foundation.util.core'; +import { Plugin } from './foundation.core.plugin'; +import { GetYoDigits } from './foundation.core.utils'; /** diff --git a/js/foundation.magellan.js b/js/foundation.magellan.js index 5c0f06dd3..15a47ab24 100644 --- a/js/foundation.magellan.js +++ b/js/foundation.magellan.js @@ -2,8 +2,8 @@ import $ from 'jquery'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; import { SmoothScroll } from './foundation.smoothScroll'; /** diff --git a/js/foundation.offcanvas.js b/js/foundation.offcanvas.js index 995bf91d4..047b04425 100644 --- a/js/foundation.offcanvas.js +++ b/js/foundation.offcanvas.js @@ -3,8 +3,8 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { MediaQuery } from './foundation.util.mediaQuery'; -import { transitionend, RegExpEscape } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { transitionend, RegExpEscape } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; import { Triggers } from './foundation.util.triggers'; diff --git a/js/foundation.orbit.js b/js/foundation.orbit.js index 38b837904..67477dd61 100644 --- a/js/foundation.orbit.js +++ b/js/foundation.orbit.js @@ -5,8 +5,8 @@ import { Keyboard } from './foundation.util.keyboard'; import { Motion } from './foundation.util.motion'; import { Timer } from './foundation.util.timer'; import { onImagesLoaded } from './foundation.util.imageLoader'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; import { Touch } from './foundation.util.touch' diff --git a/js/foundation.positionable.js b/js/foundation.positionable.js index e410e5c14..467279447 100644 --- a/js/foundation.positionable.js +++ b/js/foundation.positionable.js @@ -1,8 +1,8 @@ 'use strict'; import { Box } from './foundation.util.box'; -import { Plugin } from './foundation.plugin'; -import { rtl as Rtl } from './foundation.util.core'; +import { Plugin } from './foundation.core.plugin'; +import { rtl as Rtl } from './foundation.core.utils'; const POSITIONS = ['left', 'right', 'top', 'bottom']; const VERTICAL_ALIGNMENTS = ['top', 'bottom', 'center']; diff --git a/js/foundation.responsiveAccordionTabs.js b/js/foundation.responsiveAccordionTabs.js index 0ae378aaa..38f8cfba0 100644 --- a/js/foundation.responsiveAccordionTabs.js +++ b/js/foundation.responsiveAccordionTabs.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import { MediaQuery } from './foundation.util.mediaQuery'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin }from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin }from './foundation.core.plugin'; import { Accordion } from './foundation.accordion'; import { Tabs } from './foundation.tabs'; diff --git a/js/foundation.responsiveMenu.js b/js/foundation.responsiveMenu.js index 3bc3e757e..c01c1e5b5 100644 --- a/js/foundation.responsiveMenu.js +++ b/js/foundation.responsiveMenu.js @@ -3,8 +3,8 @@ import $ from 'jquery'; import { MediaQuery } from './foundation.util.mediaQuery'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; import { DropdownMenu } from './foundation.dropdownMenu'; import { Drilldown } from './foundation.drilldown'; diff --git a/js/foundation.responsiveToggle.js b/js/foundation.responsiveToggle.js index 7e7f67fcb..c2c9cda8b 100644 --- a/js/foundation.responsiveToggle.js +++ b/js/foundation.responsiveToggle.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import { MediaQuery } from './foundation.util.mediaQuery'; import { Motion } from './foundation.util.motion'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; /** * ResponsiveToggle module. diff --git a/js/foundation.reveal.js b/js/foundation.reveal.js index 32c5d49fc..d3844e52d 100644 --- a/js/foundation.reveal.js +++ b/js/foundation.reveal.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { MediaQuery } from './foundation.util.mediaQuery'; import { Motion } from './foundation.util.motion'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; import { Triggers } from './foundation.util.triggers'; /** diff --git a/js/foundation.slider.js b/js/foundation.slider.js index 48818c26f..4a02975b2 100644 --- a/js/foundation.slider.js +++ b/js/foundation.slider.js @@ -3,9 +3,9 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { Move } from './foundation.util.motion'; -import { GetYoDigits, rtl as Rtl } from './foundation.util.core'; +import { GetYoDigits, rtl as Rtl } from './foundation.core.utils'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; import { Touch } from './foundation.util.touch'; diff --git a/js/foundation.smoothScroll.js b/js/foundation.smoothScroll.js index bec7cebc1..4f1be1d50 100644 --- a/js/foundation.smoothScroll.js +++ b/js/foundation.smoothScroll.js @@ -1,8 +1,8 @@ 'use strict'; import $ from 'jquery'; -import { GetYoDigits } from './foundation.util.core'; -import { Plugin } from './foundation.plugin'; +import { GetYoDigits } from './foundation.core.utils'; +import { Plugin } from './foundation.core.plugin'; /** * SmoothScroll module. diff --git a/js/foundation.sticky.js b/js/foundation.sticky.js index e50f071ab..d77ded6ce 100644 --- a/js/foundation.sticky.js +++ b/js/foundation.sticky.js @@ -1,9 +1,9 @@ 'use strict'; import $ from 'jquery'; -import { GetYoDigits } from './foundation.util.core'; +import { GetYoDigits } from './foundation.core.utils'; import { MediaQuery } from './foundation.util.mediaQuery'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; import { Triggers } from './foundation.util.triggers'; /** diff --git a/js/foundation.tabs.js b/js/foundation.tabs.js index c6abf58db..b51e6edb2 100644 --- a/js/foundation.tabs.js +++ b/js/foundation.tabs.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { onImagesLoaded } from './foundation.util.imageLoader'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; /** * Tabs module. * @module foundation.tabs diff --git a/js/foundation.toggler.js b/js/foundation.toggler.js index d8c5744ec..1ecfe2a52 100644 --- a/js/foundation.toggler.js +++ b/js/foundation.toggler.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { Motion } from './foundation.util.motion'; -import { Plugin } from './foundation.plugin'; +import { Plugin } from './foundation.core.plugin'; import { Triggers } from './foundation.util.triggers'; /** diff --git a/js/foundation.tooltip.js b/js/foundation.tooltip.js index 7b2e26330..01509d0db 100644 --- a/js/foundation.tooltip.js +++ b/js/foundation.tooltip.js @@ -2,7 +2,7 @@ import $ from 'jquery'; -import { GetYoDigits } from './foundation.util.core'; +import { GetYoDigits } from './foundation.core.utils'; import { MediaQuery } from './foundation.util.mediaQuery'; import { Triggers } from './foundation.util.triggers'; import { Positionable } from './foundation.positionable'; diff --git a/js/foundation.util.box.js b/js/foundation.util.box.js index 02d8171f4..71646dae7 100644 --- a/js/foundation.util.box.js +++ b/js/foundation.util.box.js @@ -1,7 +1,7 @@ 'use strict'; -import { rtl as Rtl } from "./foundation.util.core"; +import { rtl as Rtl } from "./foundation.core.utils"; var Box = { ImNotTouchingYou: ImNotTouchingYou, diff --git a/js/foundation.util.keyboard.js b/js/foundation.util.keyboard.js index 3c1acdc15..d7db4c521 100644 --- a/js/foundation.util.keyboard.js +++ b/js/foundation.util.keyboard.js @@ -9,7 +9,7 @@ 'use strict'; import $ from 'jquery'; -import { rtl as Rtl } from './foundation.util.core'; +import { rtl as Rtl } from './foundation.core.utils'; const keyCodes = { 9: 'TAB', diff --git a/js/foundation.util.motion.js b/js/foundation.util.motion.js index 5dabb1a31..75d8d7f7c 100644 --- a/js/foundation.util.motion.js +++ b/js/foundation.util.motion.js @@ -1,7 +1,7 @@ 'use strict'; import $ from 'jquery'; -import { transitionend } from './foundation.util.core'; +import { transitionend } from './foundation.core.utils'; /** * Motion module.