From: Kevin Ball Date: Wed, 26 Apr 2017 20:01:23 +0000 (-0700) Subject: Update rtl imports to use 'rtl as Rtl' X-Git-Tag: v6.4.0-rc1~51^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe967c30ed5cf6aba8dfd0d37c155266cda23dce;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Update rtl imports to use 'rtl as Rtl' --- diff --git a/js/foundation.dropdownMenu.js b/js/foundation.dropdownMenu.js index b0e9cb9c9..8895ff396 100644 --- a/js/foundation.dropdownMenu.js +++ b/js/foundation.dropdownMenu.js @@ -4,10 +4,9 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { Nest } from './foundation.util.nest'; import { Box } from './foundation.util.box'; -import { rtl } from './foundation.util.core'; +import { rtl as Rtl } from './foundation.util.core'; import { Plugin } from './foundation.plugin'; -const Rtl = rtl; /** * DropdownMenu module. diff --git a/js/foundation.slider.js b/js/foundation.slider.js index 06bce99b4..d80ef0181 100644 --- a/js/foundation.slider.js +++ b/js/foundation.slider.js @@ -3,8 +3,7 @@ import $ from 'jquery'; import { Keyboard } from './foundation.util.keyboard'; import { Move } from './foundation.util.motion'; -import { GetYoDigits, rtl } from './foundation.util.core'; -let Rtl = rtl; +import { GetYoDigits, rtl as Rtl } from './foundation.util.core'; import { Plugin } from './foundation.plugin'; diff --git a/js/foundation.util.box.js b/js/foundation.util.box.js index de8b5d99c..d1f220928 100644 --- a/js/foundation.util.box.js +++ b/js/foundation.util.box.js @@ -1,9 +1,7 @@ 'use strict'; -import { rtl } from "./foundation.util.core"; - -var Rtl = rtl; +import { rtl as Rtl } from "./foundation.util.core"; var Box = { ImNotTouchingYou: ImNotTouchingYou, diff --git a/js/foundation.util.keyboard.js b/js/foundation.util.keyboard.js index 48d064517..3c1acdc15 100644 --- a/js/foundation.util.keyboard.js +++ b/js/foundation.util.keyboard.js @@ -9,7 +9,7 @@ 'use strict'; import $ from 'jquery'; -import { rtl } from './foundation.util.core'; +import { rtl as Rtl } from './foundation.util.core'; const keyCodes = { 9: 'TAB', @@ -80,7 +80,7 @@ var Keyboard = { if (typeof commandList.ltr === 'undefined') { // this component does not differentiate between ltr and rtl cmds = commandList; // use plain list } else { // merge ltr and rtl: if document is rtl, rtl overwrites ltr and vice versa - if (rtl()) cmds = $.extend({}, commandList.ltr, commandList.rtl); + if (Rtl()) cmds = $.extend({}, commandList.ltr, commandList.rtl); else cmds = $.extend({}, commandList.rtl, commandList.ltr); }