From: Kevin Ball <kmball11@gmail.com>
Date: Thu, 1 Jun 2017 16:16:24 +0000 (-0700)
Subject: Merge branch 'develop' into fix-missing-triggers-dependencies
X-Git-Tag: v6.4.0-rc1~12^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10098%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into fix-missing-triggers-dependencies
---

8a7d7e490cb01ec3644cd4c166cd1a46a5840c69
diff --cc js/foundation.dropdown.js
index 08ea429ec,8cc99ba2a..12e2050bd
--- a/js/foundation.dropdown.js
+++ b/js/foundation.dropdown.js
@@@ -2,11 -2,11 +2,10 @@@
  
  import $ from 'jquery';
  import { Keyboard } from './foundation.util.keyboard';
- import { Box } from './foundation.util.box';
  import { GetYoDigits } from './foundation.util.core';
- import { Plugin } from './foundation.plugin';
+ import { Positionable } from './foundation.positionable';
  
 -  // import "foundation.util.triggers.js";
 -  // TODO: Figure out what a triggers import "means", since triggers are always accessed indirectly.
 +import { Triggers } from './foundation.util.triggers';
  
  
  /**
diff --cc js/foundation.tooltip.js
index a24c79d43,82b2cfd13..12fb8ec4a
--- a/js/foundation.tooltip.js
+++ b/js/foundation.tooltip.js
@@@ -2,12 -2,12 +2,11 @@@
  
  import $ from 'jquery';
  
- import { Box } from './foundation.util.box';
  import { GetYoDigits } from './foundation.util.core';
  import { MediaQuery } from './foundation.util.mediaQuery';
 +import { Triggers } from './foundation.util.triggers';
- import { Plugin } from './foundation.plugin';
+ import { Positionable } from './foundation.positionable';
  
 -  // import "foundation.util.triggers";
 -
  /**
   * Tooltip module.
   * @module foundation.tooltip