From 91011d3d374b879d9b6da61b89d314362c6bfaf5 Mon Sep 17 00:00:00 2001
From: Geoff Kimball <geoff@zurb.com>
Date: Thu, 11 Feb 2016 13:50:36 -0800
Subject: [PATCH] Remove check for window.Foundation when registering plugins,
 and remove UMD definitions from plugins, as not every plugin had one and
 they're undocumented. UMD support won't be landing in 6.2

---
 js/foundation.abide.js                    |  6 ++----
 js/foundation.accordion.js                |  8 +++-----
 js/foundation.accordionMenu.js            | 10 ++++------
 js/foundation.drilldown.js                |  6 ++----
 js/foundation.dropdown.js                 |  6 ++----
 js/foundation.dropdownMenu.js             |  6 ++----
 js/foundation.equalizer.js                | 16 ++--------------
 js/foundation.interchange.js              |  4 ++--
 js/foundation.magellan.js                 | 14 ++------------
 js/foundation.offcanvas.js                |  6 ++----
 js/foundation.orbit.js                    |  6 ++----
 js/foundation.responsiveMenu.js           |  6 ++----
 js/foundation.responsiveToggle.js         |  6 ++----
 js/foundation.reveal.js                   |  8 +++-----
 js/foundation.slider.js                   |  6 ++----
 js/foundation.sticky.js                   |  6 ++----
 js/foundation.tabs.js                     |  6 ++----
 js/foundation.toggler.js                  | 14 ++------------
 js/foundation.tooltip.js                  |  6 ++----
 js/foundation.util.box.js                 |  8 +-------
 js/foundation.util.keyboard.js            |  6 +-----
 js/foundation.util.mediaQuery.js          |  6 +-----
 js/foundation.util.motion.js              |  6 ++----
 js/foundation.util.nest.js                |  6 +-----
 js/foundation.util.timerAndImageLoader.js |  6 ++----
 25 files changed, 50 insertions(+), 134 deletions(-)

diff --git a/js/foundation.abide.js b/js/foundation.abide.js
index 2a50888ed..78f6b1e18 100644
--- a/js/foundation.abide.js
+++ b/js/foundation.abide.js
@@ -5,7 +5,7 @@
  * @module foundation.abide
  */
 
-export default class Abide {
+class Abide {
   /**
    * Creates a new instance of Abide.
    * @class
@@ -455,6 +455,4 @@ Abide.defaults = {
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Abide, 'Abide');
-}
+Foundation.plugin(Abide, 'Abide');
diff --git a/js/foundation.accordion.js b/js/foundation.accordion.js
index bfa60298e..9c2eb5f6a 100644
--- a/js/foundation.accordion.js
+++ b/js/foundation.accordion.js
@@ -7,7 +7,7 @@
  * @requires foundation.util.motion
  */
 
-export default class Accordion {
+class Accordion {
   /**
    * Creates a new instance of an accordion.
    * @class
@@ -20,7 +20,7 @@ export default class Accordion {
     this.options = $.extend({}, Accordion.defaults, this.$element.data(), options);
 
     this._init();
-    
+
     Foundation.registerPlugin(this, 'Accordion');
     Foundation.Keyboard.register('Accordion', {
       'ENTER': 'toggle',
@@ -232,6 +232,4 @@ Accordion.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Accordion, 'Accordion');
-}
+Foundation.plugin(Accordion, 'Accordion');
diff --git a/js/foundation.accordionMenu.js b/js/foundation.accordionMenu.js
index 105dbcad7..885824842 100644
--- a/js/foundation.accordionMenu.js
+++ b/js/foundation.accordionMenu.js
@@ -8,7 +8,7 @@
  * @requires foundation.util.nest
  */
 
-export default class AccordionMenu {
+class AccordionMenu {
   /**
    * Creates a new instance of an accordion menu.
    * @class
@@ -16,7 +16,7 @@ export default class AccordionMenu {
    * @param {jQuery} element - jQuery object to make into an accordion menu.
    * @param {Object} options - Overrides to the default plugin settings.
    */
-  constructor(element, options) {  
+  constructor(element, options) {
     this.$element = element;
     this.options = $.extend({}, AccordionMenu.defaults, this.$element.data(), options);
 
@@ -38,7 +38,7 @@ export default class AccordionMenu {
     });
   }
 
-  
+
 
   /**
    * Initializes the accordion menu by hiding all nested menus.
@@ -263,6 +263,4 @@ AccordionMenu.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(AccordionMenu, 'AccordionMenu');
-}
+Foundation.plugin(AccordionMenu, 'AccordionMenu');
diff --git a/js/foundation.drilldown.js b/js/foundation.drilldown.js
index f7ebd69e4..6faed1098 100644
--- a/js/foundation.drilldown.js
+++ b/js/foundation.drilldown.js
@@ -8,7 +8,7 @@
  * @requires foundation.util.nest
  */
 
-export default class Drilldown {
+class Drilldown {
   /**
    * Creates a new instance of a drilldown menu.
    * @class
@@ -330,6 +330,4 @@ Drilldown.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Drilldown, 'Drilldown');
-}
+Foundation.plugin(Drilldown, 'Drilldown');
diff --git a/js/foundation.dropdown.js b/js/foundation.dropdown.js
index 4b5c9b18c..bd9d667da 100644
--- a/js/foundation.dropdown.js
+++ b/js/foundation.dropdown.js
@@ -8,7 +8,7 @@
  * @requires foundation.util.triggers
  */
 
-export default class Dropdown {
+class Dropdown {
   /**
    * Creates a new instance of a dropdown.
    * @class
@@ -397,6 +397,4 @@ Dropdown.defaults = {
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Dropdown, 'Dropdown');
-}
+Foundation.plugin(Dropdown, 'Dropdown');
diff --git a/js/foundation.dropdownMenu.js b/js/foundation.dropdownMenu.js
index f9c7b2ba0..efc3787e6 100644
--- a/js/foundation.dropdownMenu.js
+++ b/js/foundation.dropdownMenu.js
@@ -8,7 +8,7 @@
  * @requires foundation.util.nest
  */
 
-export default class DropdownMenu {
+class DropdownMenu {
   /**
    * Creates a new instance of DropdownMenu.
    * @class
@@ -394,6 +394,4 @@ DropdownMenu.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(DropdownMenu, 'DropdownMenu');
-}
+Foundation.plugin(DropdownMenu, 'DropdownMenu');
diff --git a/js/foundation.equalizer.js b/js/foundation.equalizer.js
index 58c4ad4ec..e7130e456 100644
--- a/js/foundation.equalizer.js
+++ b/js/foundation.equalizer.js
@@ -5,7 +5,7 @@
  * @module foundation.equalizer
  */
 
-export default class Equalizer {
+class Equalizer {
   /**
    * Creates a new instance of Equalizer.
    * @class
@@ -278,16 +278,4 @@ Equalizer.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Equalizer, 'Equalizer');
-}
-
-// Exports for AMD/Browserify
-if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
-  module.exports = Equalizer;
-if (typeof define === 'function')
-  define(['foundation'], function() {
-    return Equalizer;
-  });
-
-
+Foundation.plugin(Equalizer, 'Equalizer');
diff --git a/js/foundation.interchange.js b/js/foundation.interchange.js
index 7e6c9b670..764540e27 100644
--- a/js/foundation.interchange.js
+++ b/js/foundation.interchange.js
@@ -7,7 +7,7 @@
  * @requires foundation.util.timerAndImageLoader
  */
 
-export default class Interchange {
+class Interchange {
   /**
    * Creates a new instance of Interchange.
    * @class
@@ -186,5 +186,5 @@ Interchange.SPECIAL_QUERIES = {
 
 // Window exports
 if (window.Foundation) {
-  window.Foundation.plugin(Interchange, 'Interchange');
+  Foundation.plugin(Interchange, 'Interchange');
 }
diff --git a/js/foundation.magellan.js b/js/foundation.magellan.js
index 646dcc4de..379141e74 100644
--- a/js/foundation.magellan.js
+++ b/js/foundation.magellan.js
@@ -5,7 +5,7 @@
  * @module foundation.magellan
  */
 
-export default class Magellan {
+class Magellan {
   /**
    * Creates a new instance of Magellan.
    * @class
@@ -216,14 +216,4 @@ Magellan.defaults = {
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Magellan, 'Magellan');
-}
-
-// Exports for AMD/Browserify
-if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
-  module.exports = Magellan;
-if (typeof define === 'function')
-  define(['foundation'], function() {
-    return Magellan;
-  });
+Foundation.plugin(Magellan, 'Magellan');
diff --git a/js/foundation.offcanvas.js b/js/foundation.offcanvas.js
index b29dff35d..6897c5ec0 100644
--- a/js/foundation.offcanvas.js
+++ b/js/foundation.offcanvas.js
@@ -8,7 +8,7 @@
  * @requires foundation.util.motion
  */
 
-export default class OffCanvas {
+class OffCanvas {
   /**
    * Creates a new instance of an off-canvas wrapper.
    * @class
@@ -388,6 +388,4 @@ OffCanvas.defaults = {
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(OffCanvas, 'OffCanvas');
-}
+Foundation.plugin(OffCanvas, 'OffCanvas');
diff --git a/js/foundation.orbit.js b/js/foundation.orbit.js
index 952f39a5e..0b9c120ed 100644
--- a/js/foundation.orbit.js
+++ b/js/foundation.orbit.js
@@ -9,7 +9,7 @@
  * @requires foundation.util.touch
  */
 
-export default class Orbit {
+class Orbit {
   /**
   * Creates a new instance of an orbit carousel.
   * @class
@@ -438,6 +438,4 @@ Orbit.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Orbit, 'Orbit');
-}
+Foundation.plugin(Orbit, 'Orbit');
diff --git a/js/foundation.responsiveMenu.js b/js/foundation.responsiveMenu.js
index a9d91b186..f146b3bb6 100644
--- a/js/foundation.responsiveMenu.js
+++ b/js/foundation.responsiveMenu.js
@@ -10,7 +10,7 @@
  * @requires foundation.util.dropdown-menu
  */
 
-export default class ResponsiveMenu {
+class ResponsiveMenu {
   /**
    * Creates a new instance of a responsive menu.
    * @class
@@ -138,6 +138,4 @@ var MenuPlugins = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(ResponsiveMenu, 'ResponsiveMenu');
-}
+Foundation.plugin(ResponsiveMenu, 'ResponsiveMenu');
diff --git a/js/foundation.responsiveToggle.js b/js/foundation.responsiveToggle.js
index bf574e726..16fbfc271 100644
--- a/js/foundation.responsiveToggle.js
+++ b/js/foundation.responsiveToggle.js
@@ -6,7 +6,7 @@
  * @requires foundation.util.mediaQuery
  */
 
-export default class ResponsiveToggle {
+class ResponsiveToggle {
   /**
    * Creates a new instance of Tab Bar.
    * @class
@@ -105,6 +105,4 @@ ResponsiveToggle.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(ResponsiveToggle, 'ResponsiveToggle');
-}
+Foundation.plugin(ResponsiveToggle, 'ResponsiveToggle');
diff --git a/js/foundation.reveal.js b/js/foundation.reveal.js
index 8ee9b5bff..4f8d8a474 100644
--- a/js/foundation.reveal.js
+++ b/js/foundation.reveal.js
@@ -10,7 +10,7 @@
  * @requires foundation.util.motion if using animations
  */
 
-export default class Reveal {
+class Reveal {
   /**
    * Creates a new instance of Reveal.
    * @class
@@ -544,10 +544,8 @@ Reveal.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Reveal, 'Reveal');
-}
+Foundation.plugin(Reveal, 'Reveal');
 
-function iPhoneSniff(){
+function iPhoneSniff() {
   return /iP(ad|hone|od).*OS/.test(window.navigator.userAgent);
 }
diff --git a/js/foundation.slider.js b/js/foundation.slider.js
index c8e59291a..343e552c8 100644
--- a/js/foundation.slider.js
+++ b/js/foundation.slider.js
@@ -9,7 +9,7 @@
  * @requires foundation.util.touch
  */
 
-export default class Slider {
+class Slider {
   /**
    * Creates a new instance of a drilldown menu.
    * @class
@@ -528,9 +528,7 @@ function absPosition($handle, dir, clickPos, param) {
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Slider, 'Slider');
-}
+Foundation.plugin(Slider, 'Slider');
 
 //*********this is in case we go to static, absolute positions instead of dynamic positioning********
 // this.setSteps(function() {
diff --git a/js/foundation.sticky.js b/js/foundation.sticky.js
index 963611fc2..19de99629 100644
--- a/js/foundation.sticky.js
+++ b/js/foundation.sticky.js
@@ -7,7 +7,7 @@
  * @requires foundation.util.mediaQuery
  */
 
-export default class Sticky {
+class Sticky {
   /**
    * Creates a new instance of a sticky thing.
    * @class
@@ -440,6 +440,4 @@ function emCalc(em) {
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Sticky, 'Sticky');
-}
+Foundation.plugin(Sticky, 'Sticky');
diff --git a/js/foundation.tabs.js b/js/foundation.tabs.js
index c7c3b1934..e4172e307 100644
--- a/js/foundation.tabs.js
+++ b/js/foundation.tabs.js
@@ -7,7 +7,7 @@
  * @requires foundation.util.timerAndImageLoader if tabs contain images
  */
 
-export default class Tabs {
+class Tabs {
   /**
    * Creates a new instance of tabs.
    * @class
@@ -318,6 +318,4 @@ function checkClass($elem){
 }
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Tabs, 'Tabs');
-}
+Foundation.plugin(Tabs, 'Tabs');
diff --git a/js/foundation.toggler.js b/js/foundation.toggler.js
index 3bdb61eac..8633eff1d 100644
--- a/js/foundation.toggler.js
+++ b/js/foundation.toggler.js
@@ -6,7 +6,7 @@
  * @requires foundation.util.motion
  */
 
-export default class Toggler {
+class Toggler {
   /**
    * Creates a new instance of Toggler.
    * @class
@@ -136,14 +136,4 @@ Toggler.defaults = {
 };
 
 // Window exports
-if (window.Foundation) {
-  Foundation.plugin(Toggler, 'Toggler');
-}
-
-// Exports for AMD/Browserify
-if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
-  module.exports = Toggler;
-if (typeof define === 'function')
-  define(['foundation'], function() {
-    return Toggler;
-  });
+Foundation.plugin(Toggler, 'Toggler');
diff --git a/js/foundation.tooltip.js b/js/foundation.tooltip.js
index 3339a5e87..76361c97d 100644
--- a/js/foundation.tooltip.js
+++ b/js/foundation.tooltip.js
@@ -7,7 +7,7 @@
  * @requires foundation.util.triggers
  */
 
-export default class Tooltip {
+class Tooltip {
   /**
    * Creates a new instance of a Tooltip.
    * @class
@@ -431,6 +431,4 @@ Tooltip.defaults = {
  */
 
 // Window exports
-if (window.Foundation) {
-  window.Foundation.plugin(Tooltip, 'Tooltip');
-}
+Foundation.plugin(Tooltip, 'Tooltip');
diff --git a/js/foundation.util.box.js b/js/foundation.util.box.js
index e7023e33f..b4a395900 100644
--- a/js/foundation.util.box.js
+++ b/js/foundation.util.box.js
@@ -1,15 +1,9 @@
-var Box = {
+Foundation.Box = {
   ImNotTouchingYou: ImNotTouchingYou,
   GetDimensions: GetDimensions,
   GetOffsets: GetOffsets
 }
 
-export default Box;
-
-if (window.Foundation) {
-  window.Foundation.Box = Box;
-}
-
 /**
  * Compares the dimensions of an element to a container and determines collision events with container.
  * @function
diff --git a/js/foundation.util.keyboard.js b/js/foundation.util.keyboard.js
index d4d822a94..301e416ff 100644
--- a/js/foundation.util.keyboard.js
+++ b/js/foundation.util.keyboard.js
@@ -108,8 +108,4 @@ function getKeyCodes(kcs) {
   return k;
 }
 
-export default Keyboard;
-
-if (window.Foundation) {
-  window.Foundation.Keyboard = Keyboard;
-}
+Foundation.Keyboard = Keyboard;
diff --git a/js/foundation.util.mediaQuery.js b/js/foundation.util.mediaQuery.js
index 9428378c4..5284c1027 100644
--- a/js/foundation.util.mediaQuery.js
+++ b/js/foundation.util.mediaQuery.js
@@ -201,8 +201,4 @@ function parseStyleToObject(str) {
   return styleObject;
 }
 
-export default MediaQuery;
-
-if (window.Foundation) {
-  window.Foundation.MediaQuery = MediaQuery;
-}
+window.Foundation.MediaQuery = MediaQuery;
diff --git a/js/foundation.util.motion.js b/js/foundation.util.motion.js
index 0243e97fb..dd141a613 100644
--- a/js/foundation.util.motion.js
+++ b/js/foundation.util.motion.js
@@ -89,7 +89,5 @@ function animate(isIn, element, animation, cb) {
   }
 }
 
-if (window.Foundation) {
-  window.Foundation.Move = Move;
-  window.Foundation.Motion = Motion;
-}
+Foundation.Move = Move;
+Foundation.Motion = Motion;
diff --git a/js/foundation.util.nest.js b/js/foundation.util.nest.js
index 789f9dceb..6a29fade5 100644
--- a/js/foundation.util.nest.js
+++ b/js/foundation.util.nest.js
@@ -69,8 +69,4 @@ const Nest = {
   }
 }
 
-export default Nest;
-
-if (window.Foundation) {
-  window.Foundation.Nest = Nest;
-}
+Foundation.Nest = Nest;
diff --git a/js/foundation.util.timerAndImageLoader.js b/js/foundation.util.timerAndImageLoader.js
index f15083ab1..7ef2f6821 100644
--- a/js/foundation.util.timerAndImageLoader.js
+++ b/js/foundation.util.timerAndImageLoader.js
@@ -78,7 +78,5 @@ export function onImagesLoaded(images, callback){
   }
 }
 
-if (window.Foundation) {
-  Foundation.Timer = Timer;
-  Foundation.onImagesLoaded = onImagesLoaded;
-}
+Foundation.Timer = Timer;
+Foundation.onImagesLoaded = onImagesLoaded;
-- 
2.47.3