mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-10 23:54:08 +02:00
Code Issues Releases Wiki Activity

Rename e to event (#34979)

Browse Source
This commit is contained in:
XhmikosR
2021-09-15 14:27:46 +03:00
committed by GitHub
parent 1d484b5737
commit c5d03d93fc
8 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/carousel.js
View File

@@ -305,7 +305,7 @@ class Carousel extends BaseComponent {
} }
SelectorEngine.find(SELECTOR_ITEM_IMG, this._element).forEach(itemImg => { 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) { if (this._pointerEvent) {

6
js/tests/helpers/fixture.js
View File

@@ -24,10 +24,10 @@ export const clearFixture = () => {
} }
export const createEvent = (eventName, params = {}) => { export const createEvent = (eventName, params = {}) => {
const e = document.createEvent('Event') const event = document.createEvent('Event')
e.initEvent(eventName, Boolean(params.bubbles), Boolean(params.cancelable)) event.initEvent(eventName, Boolean(params.bubbles), Boolean(params.cancelable))
return e return event
} }
export const jQueryMock = { export const jQueryMock = {

36
js/tests/unit/carousel.spec.js
View File

@@ -240,7 +240,7 @@ describe('Carousel', () => {
return carouselEl.querySelector('.carousel-item.active').getAttribute('id') return carouselEl.querySelector('.carousel-item.active').getAttribute('id')
} }
carouselEl.addEventListener('slid.bs.carousel', e => { carouselEl.addEventListener('slid.bs.carousel', event => {
const activeId = getActiveId() const activeId = getActiveId()
if (activeId === 'two') { if (activeId === 'two') {
@@ -256,7 +256,7 @@ describe('Carousel', () => {
if (activeId === 'one') { if (activeId === 'one') {
// carousel wrapped around and slid from 3rd to 1st slide // carousel wrapped around and slid from 3rd to 1st slide
expect(activeId).toEqual('one') expect(activeId).toEqual('one')
expect(e.from + 1).toEqual(3) expect(event.from + 1).toEqual(3)
done() done()
} }
}) })
@@ -637,8 +637,8 @@ describe('Carousel', () => {
}, 20) }, 20)
} }
carouselEl.addEventListener('slide.bs.carousel', e => { carouselEl.addEventListener('slide.bs.carousel', event => {
e.preventDefault() event.preventDefault()
doneTest() doneTest()
}) })
@@ -663,11 +663,11 @@ describe('Carousel', () => {
const carouselEl = fixtureEl.querySelector('#myCarousel') const carouselEl = fixtureEl.querySelector('#myCarousel')
const carousel = new Carousel(carouselEl, {}) const carousel = new Carousel(carouselEl, {})
const onSlide = e => { const onSlide = event => {
expect(e.direction).toEqual('left') expect(event.direction).toEqual('left')
expect(e.relatedTarget.classList.contains('carousel-item')).toEqual(true) expect(event.relatedTarget.classList.contains('carousel-item')).toEqual(true)
expect(e.from).toEqual(0) expect(event.from).toEqual(0)
expect(e.to).toEqual(1) expect(event.to).toEqual(1)
carouselEl.removeEventListener('slide.bs.carousel', onSlide) carouselEl.removeEventListener('slide.bs.carousel', onSlide)
carouselEl.addEventListener('slide.bs.carousel', onSlide2) carouselEl.addEventListener('slide.bs.carousel', onSlide2)
@@ -675,8 +675,8 @@ describe('Carousel', () => {
carousel.prev() carousel.prev()
} }
const onSlide2 = e => { const onSlide2 = event => {
expect(e.direction).toEqual('right') expect(event.direction).toEqual('right')
done() done()
} }
@@ -698,11 +698,11 @@ describe('Carousel', () => {
const carouselEl = fixtureEl.querySelector('#myCarousel') const carouselEl = fixtureEl.querySelector('#myCarousel')
const carousel = new Carousel(carouselEl, {}) const carousel = new Carousel(carouselEl, {})
const onSlid = e => { const onSlid = event => {
expect(e.direction).toEqual('left') expect(event.direction).toEqual('left')
expect(e.relatedTarget.classList.contains('carousel-item')).toEqual(true) expect(event.relatedTarget.classList.contains('carousel-item')).toEqual(true)
expect(e.from).toEqual(0) expect(event.from).toEqual(0)
expect(e.to).toEqual(1) expect(event.to).toEqual(1)
carouselEl.removeEventListener('slid.bs.carousel', onSlid) carouselEl.removeEventListener('slid.bs.carousel', onSlid)
carouselEl.addEventListener('slid.bs.carousel', onSlid2) carouselEl.addEventListener('slid.bs.carousel', onSlid2)
@@ -710,8 +710,8 @@ describe('Carousel', () => {
carousel.prev() carousel.prev()
} }
const onSlid2 = e => { const onSlid2 = event => {
expect(e.direction).toEqual('right') expect(event.direction).toEqual('right')
done() done()
} }

8
js/tests/unit/collapse.spec.js
View File

@@ -331,8 +331,8 @@ describe('Collapse', () => {
}, 10) }, 10)
} }
collapseEl.addEventListener('show.bs.collapse', e => { collapseEl.addEventListener('show.bs.collapse', event => {
e.preventDefault() event.preventDefault()
expectEnd() expectEnd()
}) })
@@ -408,8 +408,8 @@ describe('Collapse', () => {
}, 10) }, 10)
} }
collapseEl.addEventListener('hide.bs.collapse', e => { collapseEl.addEventListener('hide.bs.collapse', event => {
e.preventDefault() event.preventDefault()
expectEnd() expectEnd()
}) })

28
js/tests/unit/dropdown.spec.js
View File

@@ -576,8 +576,8 @@ describe('Dropdown', () => {
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]') const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
const dropdown = new Dropdown(btnDropdown) const dropdown = new Dropdown(btnDropdown)
btnDropdown.addEventListener('show.bs.dropdown', e => { btnDropdown.addEventListener('show.bs.dropdown', event => {
e.preventDefault() event.preventDefault()
}) })
btnDropdown.addEventListener('shown.bs.dropdown', () => { btnDropdown.addEventListener('shown.bs.dropdown', () => {
@@ -703,8 +703,8 @@ describe('Dropdown', () => {
const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]') const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
const dropdown = new Dropdown(btnDropdown) const dropdown = new Dropdown(btnDropdown)
btnDropdown.addEventListener('show.bs.dropdown', e => { btnDropdown.addEventListener('show.bs.dropdown', event => {
e.preventDefault() event.preventDefault()
}) })
btnDropdown.addEventListener('shown.bs.dropdown', () => { btnDropdown.addEventListener('shown.bs.dropdown', () => {
@@ -861,8 +861,8 @@ describe('Dropdown', () => {
const dropdownMenu = fixtureEl.querySelector('.dropdown-menu') const dropdownMenu = fixtureEl.querySelector('.dropdown-menu')
const dropdown = new Dropdown(btnDropdown) const dropdown = new Dropdown(btnDropdown)
btnDropdown.addEventListener('hide.bs.dropdown', e => { btnDropdown.addEventListener('hide.bs.dropdown', event => {
e.preventDefault() event.preventDefault()
}) })
btnDropdown.addEventListener('hidden.bs.dropdown', () => { btnDropdown.addEventListener('hidden.bs.dropdown', () => {
@@ -1033,11 +1033,11 @@ describe('Dropdown', () => {
showEventTriggered = true 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.classList.contains('show')).toEqual(true)
expect(btnDropdown.getAttribute('aria-expanded')).toEqual('true') expect(btnDropdown.getAttribute('aria-expanded')).toEqual('true')
expect(showEventTriggered).toEqual(true) expect(showEventTriggered).toEqual(true)
expect(e.relatedTarget).toEqual(btnDropdown) expect(event.relatedTarget).toEqual(btnDropdown)
document.body.click() document.body.click()
})) }))
@@ -1045,11 +1045,11 @@ describe('Dropdown', () => {
hideEventTriggered = true hideEventTriggered = true
}) })
btnDropdown.addEventListener('hidden.bs.dropdown', e => { btnDropdown.addEventListener('hidden.bs.dropdown', event => {
expect(btnDropdown.classList.contains('show')).toEqual(false) expect(btnDropdown.classList.contains('show')).toEqual(false)
expect(btnDropdown.getAttribute('aria-expanded')).toEqual('false') expect(btnDropdown.getAttribute('aria-expanded')).toEqual('false')
expect(hideEventTriggered).toEqual(true) expect(hideEventTriggered).toEqual(true)
expect(e.relatedTarget).toEqual(btnDropdown) expect(event.relatedTarget).toEqual(btnDropdown)
done() done()
}) })
@@ -1347,12 +1347,12 @@ describe('Dropdown', () => {
const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]') const triggerDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
triggerDropdown.addEventListener('hide.bs.dropdown', e => { triggerDropdown.addEventListener('hide.bs.dropdown', event => {
expect(e.clickEvent).toBeUndefined() expect(event.clickEvent).toBeUndefined()
}) })
triggerDropdown.addEventListener('hidden.bs.dropdown', e => { triggerDropdown.addEventListener('hidden.bs.dropdown', event => {
expect(e.clickEvent).toBeUndefined() expect(event.clickEvent).toBeUndefined()
done() done()
}) })

28
js/tests/unit/modal.spec.js
View File

@@ -90,8 +90,8 @@ describe('Modal', () => {
const modalEl = fixtureEl.querySelector('.modal') const modalEl = fixtureEl.querySelector('.modal')
const modal = new Modal(modalEl) const modal = new Modal(modalEl)
modalEl.addEventListener('show.bs.modal', e => { modalEl.addEventListener('show.bs.modal', event => {
expect(e).toBeDefined() expect(event).toBeDefined()
}) })
modalEl.addEventListener('shown.bs.modal', () => { modalEl.addEventListener('shown.bs.modal', () => {
@@ -114,8 +114,8 @@ describe('Modal', () => {
backdrop: false backdrop: false
}) })
modalEl.addEventListener('show.bs.modal', e => { modalEl.addEventListener('show.bs.modal', event => {
expect(e).toBeDefined() expect(event).toBeDefined()
}) })
modalEl.addEventListener('shown.bs.modal', () => { modalEl.addEventListener('shown.bs.modal', () => {
@@ -184,8 +184,8 @@ describe('Modal', () => {
const modalEl = fixtureEl.querySelector('.modal') const modalEl = fixtureEl.querySelector('.modal')
const modal = new Modal(modalEl) const modal = new Modal(modalEl)
modalEl.addEventListener('show.bs.modal', e => { modalEl.addEventListener('show.bs.modal', event => {
e.preventDefault() event.preventDefault()
const expectedDone = () => { const expectedDone = () => {
expect().nothing() expect().nothing()
@@ -209,9 +209,9 @@ describe('Modal', () => {
const modal = new Modal(modalEl) const modal = new Modal(modalEl)
let prevented = false let prevented = false
modalEl.addEventListener('show.bs.modal', e => { modalEl.addEventListener('show.bs.modal', event => {
if (!prevented) { if (!prevented) {
e.preventDefault() event.preventDefault()
prevented = true prevented = true
setTimeout(() => { setTimeout(() => {
@@ -616,8 +616,8 @@ describe('Modal', () => {
modal.hide() modal.hide()
}) })
modalEl.addEventListener('hide.bs.modal', e => { modalEl.addEventListener('hide.bs.modal', event => {
expect(e).toBeDefined() expect(event).toBeDefined()
}) })
modalEl.addEventListener('hidden.bs.modal', () => { modalEl.addEventListener('hidden.bs.modal', () => {
@@ -694,8 +694,8 @@ describe('Modal', () => {
}, 10) }, 10)
} }
modalEl.addEventListener('hide.bs.modal', e => { modalEl.addEventListener('hide.bs.modal', event => {
e.preventDefault() event.preventDefault()
hideCallback() hideCallback()
}) })
@@ -971,8 +971,8 @@ describe('Modal', () => {
}, 10) }, 10)
} }
modalEl.addEventListener('show.bs.modal', e => { modalEl.addEventListener('show.bs.modal', event => {
e.preventDefault() event.preventDefault()
showListener() showListener()
}) })

8
js/tests/unit/offcanvas.spec.js
View File

@@ -316,8 +316,8 @@ describe('Offcanvas', () => {
}, 10) }, 10)
} }
offCanvasEl.addEventListener('show.bs.offcanvas', e => { offCanvasEl.addEventListener('show.bs.offcanvas', event => {
e.preventDefault() event.preventDefault()
expectEnd() expectEnd()
}) })
@@ -410,8 +410,8 @@ describe('Offcanvas', () => {
}, 10) }, 10)
} }
offCanvasEl.addEventListener('hide.bs.offcanvas', e => { offCanvasEl.addEventListener('hide.bs.offcanvas', event => {
e.preventDefault() event.preventDefault()
expectEnd() expectEnd()
}) })

22
site/assets/js/application.js
View File

@@ -94,8 +94,8 @@
// Disable empty links in docs examples // Disable empty links in docs examples
document.querySelectorAll('.bd-content [href="#"]') document.querySelectorAll('.bd-content [href="#"]')
.forEach(function (link) { .forEach(function (link) {
link.addEventListener('click', function (e) { link.addEventListener('click', function (event) {
e.preventDefault() event.preventDefault()
}) })
}) })
@@ -142,25 +142,25 @@
} }
}) })
clipboard.on('success', function (e) { clipboard.on('success', function (event) {
var tooltipBtn = bootstrap.Tooltip.getInstance(e.trigger) 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() tooltipBtn.show()
e.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard') event.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard')
e.clearSelection() event.clearSelection()
}) })
clipboard.on('error', function (e) { clipboard.on('error', function (event) {
var modifierKey = /mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-' var modifierKey = /mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-'
var fallbackMsg = 'Press ' + modifierKey + 'C to copy' 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() tooltipBtn.show()
e.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard') event.trigger.setAttribute('data-bs-original-title', 'Copy to clipboard')
}) })
anchors.options = { anchors.options = {