Skip to content

Commit

Permalink
Rename e to event
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Sep 15, 2021
1 parent 1d484b5 commit 57292d7
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion js/src/carousel.js
View file
Expand Up @@ -305,7 +305,7 @@ class Carousel extends BaseComponent {
}

SelectorEngine.find(SELECTOR_ITEM_IMG, this._element).forEach(itemImg => {
EventHandler.on(itemImg, EVENT_DRAG_START, e => e.preventDefault())
EventHandler.on(itemImg, EVENT_DRAG_START, event => event.preventDefault())
})

if (this._pointerEvent) {
Expand Down
6 changes: 3 additions & 3 deletions js/tests/helpers/fixture.js
View file
Expand Up @@ -24,10 +24,10 @@ export const clearFixture = () => {
}

export const createEvent = (eventName, params = {}) => {
const e = document.createEvent('Event')
const event = document.createEvent('Event')

e.initEvent(eventName, Boolean(params.bubbles), Boolean(params.cancelable))
return e
event.initEvent(eventName, Boolean(params.bubbles), Boolean(params.cancelable))
return event
}

export const jQueryMock = {
Expand Down
36 changes: 18 additions & 18 deletions js/tests/unit/carousel.spec.js
View file
Expand Up @@ -240,7 +240,7 @@ describe('Carousel', () => {
return carouselEl.querySelector('.carousel-item.active').getAttribute('id')
}

carouselEl.addEventListener('slid.bs.carousel', e => {
carouselEl.addEventListener('slid.bs.carousel', event => {
const activeId = getActiveId()

if (activeId === 'two') {
Expand All @@ -256,7 +256,7 @@ describe('Carousel', () => {
if (activeId === 'one') {
// carousel wrapped around and slid from 3rd to 1st slide
expect(activeId).toEqual('one')
expect(e.from + 1).toEqual(3)
expect(event.from + 1).toEqual(3)
done()
}
})
Expand Down Expand Up @@ -637,8 +637,8 @@ describe('Carousel', () => {
}, 20)
}

carouselEl.addEventListener('slide.bs.carousel', e => {
e.preventDefault()
carouselEl.addEventListener('slide.bs.carousel', event => {
event.preventDefault()
doneTest()
})

Expand All @@ -663,20 +663,20 @@ describe('Carousel', () => {
const carouselEl = fixtureEl.querySelector('#myCarousel')
const carousel = new Carousel(carouselEl, {})

const onSlide = e => {
expect(e.direction).toEqual('left')
expect(e.relatedTarget.classList.contains('carousel-item')).toEqual(true)
expect(e.from).toEqual(0)
expect(e.to).toEqual(1)
const onSlide = event => {
expect(event.direction).toEqual('left')
expect(event.relatedTarget.classList.contains('carousel-item')).toEqual(true)
expect(event.from).toEqual(0)
expect(event.to).toEqual(1)

carouselEl.removeEventListener('slide.bs.carousel', onSlide)
carouselEl.addEventListener('slide.bs.carousel', onSlide2)

carousel.prev()
}

const onSlide2 = e => {
expect(e.direction).toEqual('right')
const onSlide2 = event => {
expect(event.direction).toEqual('right')
done()
}

Expand All @@ -698,20 +698,20 @@ describe('Carousel', () => {
const carouselEl = fixtureEl.querySelector('#myCarousel')
const carousel = new Carousel(carouselEl, {})

const onSlid = e => {
expect(e.direction).toEqual('left')
expect(e.relatedTarget.classList.contains('carousel-item')).toEqual(true)
expect(e.from).toEqual(0)
expect(e.to).toEqual(1)
const onSlid = event => {
expect(event.direction).toEqual('left')
expect(event.relatedTarget.classList.contains('carousel-item')).toEqual(true)
expect(event.from).toEqual(0)
expect(event.to).toEqual(1)

carouselEl.removeEventListener('slid.bs.carousel', onSlid)
carouselEl.addEventListener('slid.bs.carousel', onSlid2)

carousel.prev()
}

const onSlid2 = e => {
expect(e.direction).toEqual('right')
const onSlid2 = event => {
expect(event.direction).toEqual('right')
done()
}

Expand Down
8 changes: 4 additions & 4 deletions js/tests/unit/collapse.spec.js
View file
Expand Up @@ -331,8 +331,8 @@ describe('Collapse', () => {
}, 10)
}

collapseEl.addEventListener('show.bs.collapse', e => {
e.preventDefault()
collapseEl.addEventListener('show.bs.collapse', event => {
event.preventDefault()
expectEnd()
})

Expand Down Expand Up @@ -408,8 +408,8 @@ describe('Collapse', () => {
}, 10)
}

collapseEl.addEventListener('hide.bs.collapse', e => {
e.preventDefault()
collapseEl.addEventListener('hide.bs.collapse', event => {
event.preventDefault()
expectEnd()
})

Expand Down
28 changes: 14 additions & 14 deletions js/tests/unit/dropdown.spec.js
View file
Expand Up @@ -576,8 +576,8 @@ describe('Dropdown', () => {
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
const dropdown = new Dropdown(btnDropdown)

btnDropdown.addEventListener('show.bs.dropdown', e => {
e.preventDefault()
btnDropdown.addEventListener('show.bs.dropdown', event => {
event.preventDefault()
})

btnDropdown.addEventListener('shown.bs.dropdown', () => {
Expand Down Expand Up @@ -703,8 +703,8 @@ describe('Dropdown', () => {
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
const dropdown = new Dropdown(btnDropdown)

btnDropdown.addEventListener('show.bs.dropdown', e => {
e.preventDefault()
btnDropdown.addEventListener('show.bs.dropdown', event => {
event.preventDefault()
})

btnDropdown.addEventListener('shown.bs.dropdown', () => {
Expand Down Expand Up @@ -861,8 +861,8 @@ describe('Dropdown', () => {
const dropdownMenu = fixtureEl.querySelector('.dropdown-menu')
const dropdown = new Dropdown(btnDropdown)

btnDropdown.addEventListener('hide.bs.dropdown', e => {
e.preventDefault()
btnDropdown.addEventListener('hide.bs.dropdown', event => {
event.preventDefault()
})

btnDropdown.addEventListener('hidden.bs.dropdown', () => {
Expand Down Expand Up @@ -1033,23 +1033,23 @@ describe('Dropdown', () => {
showEventTriggered = true
})

btnDropdown.addEventListener('shown.bs.dropdown', e => setTimeout(() => {
btnDropdown.addEventListener('shown.bs.dropdown', event => setTimeout(() => {
expect(btnDropdown.classList.contains('show')).toEqual(true)
expect(btnDropdown.getAttribute('aria-expanded')).toEqual('true')
expect(showEventTriggered).toEqual(true)
expect(e.relatedTarget).toEqual(btnDropdown)
expect(event.relatedTarget).toEqual(btnDropdown)
document.body.click()
}))

btnDropdown.addEventListener('hide.bs.dropdown', () => {
hideEventTriggered = true
})

btnDropdown.addEventListener('hidden.bs.dropdown', e => {
btnDropdown.addEventListener('hidden.bs.dropdown', event => {
expect(btnDropdown.classList.contains('show')).toEqual(false)
expect(btnDropdown.getAttribute('aria-expanded')).toEqual('false')
expect(hideEventTriggered).toEqual(true)
expect(e.relatedTarget).toEqual(btnDropdown)
expect(event.relatedTarget).toEqual(btnDropdown)
done()
})

Expand Down Expand Up @@ -1347,12 +1347,12 @@ describe('Dropdown', () => {

const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')

triggerDropdown.addEventListener('hide.bs.dropdown', e => {
expect(e.clickEvent).toBeUndefined()
triggerDropdown.addEventListener('hide.bs.dropdown', event => {
expect(event.clickEvent).toBeUndefined()
})

triggerDropdown.addEventListener('hidden.bs.dropdown', e => {
expect(e.clickEvent).toBeUndefined()
triggerDropdown.addEventListener('hidden.bs.dropdown', event => {
expect(event.clickEvent).toBeUndefined()
done()
})

Expand Down
28 changes: 14 additions & 14 deletions js/tests/unit/modal.spec.js
View file
Expand Up @@ -90,8 +90,8 @@ describe('Modal', () => {
const modalEl = fixtureEl.querySelector('.modal')
const modal = new Modal(modalEl)

modalEl.addEventListener('show.bs.modal', e => {
expect(e).toBeDefined()
modalEl.addEventListener('show.bs.modal', event => {
expect(event).toBeDefined()
})

modalEl.addEventListener('shown.bs.modal', () => {
Expand All @@ -114,8 +114,8 @@ describe('Modal', () => {
backdrop: false
})

modalEl.addEventListener('show.bs.modal', e => {
expect(e).toBeDefined()
modalEl.addEventListener('show.bs.modal', event => {
expect(event).toBeDefined()
})

modalEl.addEventListener('shown.bs.modal', () => {
Expand Down Expand Up @@ -184,8 +184,8 @@ describe('Modal', () => {
const modalEl = fixtureEl.querySelector('.modal')
const modal = new Modal(modalEl)

modalEl.addEventListener('show.bs.modal', e => {
e.preventDefault()
modalEl.addEventListener('show.bs.modal', event => {
event.preventDefault()

const expectedDone = () => {
expect().nothing()
Expand All @@ -209,9 +209,9 @@ describe('Modal', () => {
const modal = new Modal(modalEl)

let prevented = false
modalEl.addEventListener('show.bs.modal', e => {
modalEl.addEventListener('show.bs.modal', event => {
if (!prevented) {
e.preventDefault()
event.preventDefault()
prevented = true

setTimeout(() => {
Expand Down Expand Up @@ -616,8 +616,8 @@ describe('Modal', () => {
modal.hide()
})

modalEl.addEventListener('hide.bs.modal', e => {
expect(e).toBeDefined()
modalEl.addEventListener('hide.bs.modal', event => {
expect(event).toBeDefined()
})

modalEl.addEventListener('hidden.bs.modal', () => {
Expand Down Expand Up @@ -694,8 +694,8 @@ describe('Modal', () => {
}, 10)
}

modalEl.addEventListener('hide.bs.modal', e => {
e.preventDefault()
modalEl.addEventListener('hide.bs.modal', event => {
event.preventDefault()
hideCallback()
})

Expand Down Expand Up @@ -971,8 +971,8 @@ describe('Modal', () => {
}, 10)
}

modalEl.addEventListener('show.bs.modal', e => {
e.preventDefault()
modalEl.addEventListener('show.bs.modal', event => {
event.preventDefault()
showListener()
})

Expand Down
8 changes: 4 additions & 4 deletions js/tests/unit/offcanvas.spec.js
View file
Expand Up @@ -316,8 +316,8 @@ describe('Offcanvas', () => {
}, 10)
}

offCanvasEl.addEventListener('show.bs.offcanvas', e => {
e.preventDefault()
offCanvasEl.addEventListener('show.bs.offcanvas', event => {
event.preventDefault()
expectEnd()
})

Expand Down Expand Up @@ -410,8 +410,8 @@ describe('Offcanvas', () => {
}, 10)
}

offCanvasEl.addEventListener('hide.bs.offcanvas', e => {
e.preventDefault()
offCanvasEl.addEventListener('hide.bs.offcanvas', event => {
event.preventDefault()
expectEnd()
})

Expand Down
22 changes: 11 additions & 11 deletions site/assets/js/application.js
View file
Expand Up @@ -94,8 +94,8 @@
// Disable empty links in docs examples
document.querySelectorAll('.bd-content [href="#"]')
.forEach(function (link) {
link.addEventListener('click', function (e) {
e.preventDefault()
link.addEventListener('click', function (event) {
event.preventDefault()
})
})

Expand Down Expand Up @@ -142,25 +142,25 @@
}
})

clipboard.on('success', function (e) {
var tooltipBtn = bootstrap.Tooltip.getInstance(e.trigger)
clipboard.on('success', function (event) {
var tooltipBtn = bootstrap.Tooltip.getInstance(event.trigger)

e.trigger.setAttribute('data-bs-original-title', 'Copied!')
event.trigger.setAttribute('data-bs-original-title', 'Copied!')
tooltipBtn.show()

e.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard')
e.clearSelection()
event.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard')
event.clearSelection()
})

clipboard.on('error', function (e) {
clipboard.on('error', function (event) {
var modifierKey = /mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-'
var fallbackMsg = 'Press ' + modifierKey + 'C to copy'
var tooltipBtn = bootstrap.Tooltip.getInstance(e.trigger)
var tooltipBtn = bootstrap.Tooltip.getInstance(event.trigger)

e.trigger.setAttribute('data-bs-original-title', fallbackMsg)
event.trigger.setAttribute('data-bs-original-title', fallbackMsg)
tooltipBtn.show()

e.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard')
event.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard')
})

anchors.options = {
Expand Down

0 comments on commit 57292d7

Please sign in to comment.