mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

remove underscore for static methods

Browse Source
This commit is contained in:
Johann-S
2019-07-28 15:24:46 +02:00
parent 144220f0c5
commit dcba526775
32 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/src/modal/modal.js
+4 -4
View File
@@ -513,7 +513,7 @@ class Modal {
// Static
static _jQueryInterface(config, relatedTarget) {
static jQueryInterface(config, relatedTarget) {
return this.each(function () {
let data = Data.getData(this, DATA_KEY)
const _config = {
@@ -538,7 +538,7 @@ class Modal {
})
}
static _getInstance(element) {
static getInstance(element) {
return Data.getData(element, DATA_KEY)
}
}
@@ -591,11 +591,11 @@ EventHandler.on(document, Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (
/* istanbul ignore if */
if (typeof $ !== 'undefined') {
const JQUERY_NO_CONFLICT = $.fn[NAME]
$.fn[NAME] = Modal._jQueryInterface
$.fn[NAME] = Modal.jQueryInterface
$.fn[NAME].Constructor = Modal
$.fn[NAME].noConflict = () => {
$.fn[NAME] = JQUERY_NO_CONFLICT
return Modal._jQueryInterface
return Modal.jQueryInterface
}
}
js/src/modal/modal.spec.js
+15 -15
View File
@@ -711,13 +711,13 @@ describe('Modal', () => {
const modalEl = fixtureEl.querySelector('.modal')
const modal = new Modal(modalEl)
expect(Modal._getInstance(modalEl)).toEqual(modal)
expect(Modal.getInstance(modalEl)).toEqual(modal)
spyOn(EventHandler, 'off')
modal.dispose()
expect(Modal._getInstance(modalEl)).toEqual(null)
expect(Modal.getInstance(modalEl)).toEqual(null)
expect(EventHandler.off).toHaveBeenCalledTimes(4)
})
})
@@ -813,7 +813,7 @@ describe('Modal', () => {
spyOn(trigger, 'focus')
modalEl.addEventListener('shown.bs.modal', () => {
const modal = Modal._getInstance(modalEl)
const modal = Modal.getInstance(modalEl)
modal.hide()
})
@@ -844,7 +844,7 @@ describe('Modal', () => {
spyOn(trigger, 'focus')
modalEl.addEventListener('shown.bs.modal', () => {
const modal = Modal._getInstance(modalEl)
const modal = Modal.getInstance(modalEl)
modal.hide()
})
@@ -890,18 +890,18 @@ describe('Modal', () => {
})
})
describe('_jQueryInterface', () => {
describe('jQueryInterface', () => {
it('should create a modal', () => {
fixtureEl.innerHTML = '<div class="modal"><div class="modal-dialog" /></div>'
const div = fixtureEl.querySelector('div')
jQueryMock.fn.modal = Modal._jQueryInterface
jQueryMock.fn.modal = Modal.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.modal.call(jQueryMock)
expect(Modal._getInstance(div)).toBeDefined()
expect(Modal.getInstance(div)).toBeDefined()
})
it('should not re create a modal', () => {
@@ -910,12 +910,12 @@ describe('Modal', () => {
const div = fixtureEl.querySelector('div')
const modal = new Modal(div)
jQueryMock.fn.modal = Modal._jQueryInterface
jQueryMock.fn.modal = Modal.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.modal.call(jQueryMock)
expect(Modal._getInstance(div)).toEqual(modal)
expect(Modal.getInstance(div)).toEqual(modal)
})
it('should throw error on undefined method', () => {
@@ -924,7 +924,7 @@ describe('Modal', () => {
const div = fixtureEl.querySelector('div')
const action = 'undefinedMethod'
jQueryMock.fn.modal = Modal._jQueryInterface
jQueryMock.fn.modal = Modal.jQueryInterface
jQueryMock.elements = [div]
try {
@@ -940,7 +940,7 @@ describe('Modal', () => {
const div = fixtureEl.querySelector('div')
const modal = new Modal(div)
jQueryMock.fn.modal = Modal._jQueryInterface
jQueryMock.fn.modal = Modal.jQueryInterface
jQueryMock.elements = [div]
spyOn(modal, 'show')
@@ -955,7 +955,7 @@ describe('Modal', () => {
const div = fixtureEl.querySelector('div')
jQueryMock.fn.modal = Modal._jQueryInterface
jQueryMock.fn.modal = Modal.jQueryInterface
jQueryMock.elements = [div]
spyOn(Modal.prototype, 'show')
@@ -966,14 +966,14 @@ describe('Modal', () => {
})
})
describe('_getInstance', () => {
describe('getInstance', () => {
it('should return modal instance', () => {
fixtureEl.innerHTML = '<div class="modal"><div class="modal-dialog" /></div>'
const div = fixtureEl.querySelector('div')
const modal = new Modal(div)
expect(Modal._getInstance(div)).toEqual(modal)
expect(Modal.getInstance(div)).toEqual(modal)
})
it('should return null when there is no modal instance', () => {
@@ -981,7 +981,7 @@ describe('Modal', () => {
const div = fixtureEl.querySelector('div')
expect(Modal._getInstance(div)).toEqual(null)
expect(Modal.getInstance(div)).toEqual(null)
})
})
})