From: Nicolas Coden Date: Thu, 29 Mar 2018 21:44:32 +0000 (+0200) Subject: Merge remote-tracking branch 'zurb/develop' into fix/dropdown-menu-closing-on-scroll... X-Git-Tag: v6.6.0~3^2~257^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11091%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Merge remote-tracking branch 'zurb/develop' into fix/dropdown-menu-closing-on-scroll-9823 --- f9a0fd9b9c005b009fe0f38150048c6c1dd625e1 diff --cc js/foundation.dropdownMenu.js index a0be51143,6fc47de6f..cda12be0c --- a/js/foundation.dropdownMenu.js +++ b/js/foundation.dropdownMenu.js @@@ -1,13 -1,13 +1,14 @@@ 'use strict'; import $ from 'jquery'; ++import { Plugin } from './foundation.core.plugin'; ++import { rtl as Rtl } from './foundation.core.utils'; 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'; +import { Touch } from './foundation.util.touch' + /** * DropdownMenu module. * @module foundation.dropdownMenu