Skip to content

Commit

Permalink
util: change isRTL to a function
Browse files Browse the repository at this point in the history
This allows the bundler to tree-shake the function.
  • Loading branch information
XhmikosR committed Feb 16, 2021
1 parent 3602828 commit c5118c6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 19 deletions.
8 changes: 4 additions & 4 deletions js/src/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class Carousel extends BaseComponent {

// swipe left
if (direction > 0) {
if (isRTL) {
if (isRTL()) {
this.next()
} else {
this.prev()
Expand All @@ -262,7 +262,7 @@ class Carousel extends BaseComponent {

// swipe right
if (direction < 0) {
if (isRTL) {
if (isRTL()) {
this.prev()
} else {
this.next()
Expand Down Expand Up @@ -350,14 +350,14 @@ class Carousel extends BaseComponent {

if (event.key === ARROW_LEFT_KEY) {
event.preventDefault()
if (isRTL) {
if (isRTL()) {
this.next()
} else {
this.prev()
}
} else if (event.key === ARROW_RIGHT_KEY) {
event.preventDefault()
if (isRTL) {
if (isRTL()) {
this.prev()
} else {
this.next()
Expand Down
12 changes: 6 additions & 6 deletions js/src/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ const SELECTOR_MENU = '.dropdown-menu'
const SELECTOR_NAVBAR_NAV = '.navbar-nav'
const SELECTOR_VISIBLE_ITEMS = '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)'

const PLACEMENT_TOP = isRTL ? 'top-end' : 'top-start'
const PLACEMENT_TOPEND = isRTL ? 'top-start' : 'top-end'
const PLACEMENT_BOTTOM = isRTL ? 'bottom-end' : 'bottom-start'
const PLACEMENT_BOTTOMEND = isRTL ? 'bottom-start' : 'bottom-end'
const PLACEMENT_RIGHT = isRTL ? 'left-start' : 'right-start'
const PLACEMENT_LEFT = isRTL ? 'right-start' : 'left-start'
const PLACEMENT_TOP = isRTL() ? 'top-end' : 'top-start'
const PLACEMENT_TOPEND = isRTL() ? 'top-start' : 'top-end'
const PLACEMENT_BOTTOM = isRTL() ? 'bottom-end' : 'bottom-start'
const PLACEMENT_BOTTOMEND = isRTL() ? 'bottom-start' : 'bottom-end'
const PLACEMENT_RIGHT = isRTL() ? 'left-start' : 'right-start'
const PLACEMENT_LEFT = isRTL() ? 'right-start' : 'left-start'

const Default = {
offset: [0, 2],
Expand Down
7 changes: 3 additions & 4 deletions js/src/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,13 @@ class Modal extends BaseComponent {
// ----------------------------------------------------------------------

_adjustDialog() {
const isModalOverflowing =
this._element.scrollHeight > document.documentElement.clientHeight
const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight

if ((!this._isBodyOverflowing && isModalOverflowing && !isRTL) || (this._isBodyOverflowing && !isModalOverflowing && isRTL)) {
if ((!this._isBodyOverflowing && isModalOverflowing && !isRTL()) || (this._isBodyOverflowing && !isModalOverflowing && isRTL())) {
this._element.style.paddingLeft = `${this._scrollbarWidth}px`
}

if ((this._isBodyOverflowing && !isModalOverflowing && !isRTL) || (!this._isBodyOverflowing && isModalOverflowing && isRTL)) {
if ((this._isBodyOverflowing && !isModalOverflowing && !isRTL()) || (!this._isBodyOverflowing && isModalOverflowing && isRTL())) {
this._element.style.paddingRight = `${this._scrollbarWidth}px`
}
}
Expand Down
7 changes: 3 additions & 4 deletions js/src/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ const DefaultType = {
const AttachmentMap = {
AUTO: 'auto',
TOP: 'top',
RIGHT: isRTL ? 'left' : 'right',
RIGHT: isRTL() ? 'left' : 'right',
BOTTOM: 'bottom',
LEFT: isRTL ? 'right' : 'left'
LEFT: isRTL() ? 'right' : 'left'
}

const Default = {
Expand Down Expand Up @@ -563,8 +563,7 @@ class Tooltip extends BaseComponent {

triggers.forEach(trigger => {
if (trigger === 'click') {
EventHandler.on(this._element, this.constructor.Event.CLICK, this.config.selector, event => this.toggle(event)
)
EventHandler.on(this._element, this.constructor.Event.CLICK, this.config.selector, event => this.toggle(event))
} else if (trigger !== TRIGGER_MANUAL) {
const eventIn = trigger === TRIGGER_HOVER ?
this.constructor.Event.MOUSEENTER :
Expand Down
2 changes: 1 addition & 1 deletion js/src/util/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ const onDOMContentLoaded = callback => {
}
}

const isRTL = document.documentElement.dir === 'rtl'
const isRTL = () => document.documentElement.dir === 'rtl'

const defineJQueryPlugin = (name, plugin) => {
onDOMContentLoaded(() => {
Expand Down

0 comments on commit c5118c6

Please sign in to comment.