aboutsummaryrefslogtreecommitdiff
path: root/js/src/collapse
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2019-07-28 15:24:46 +0200
committerJohann-S <[email protected]>2019-07-29 11:34:12 +0200
commitdcba52677556bedb04a07825c2023e0beeea6f1e (patch)
treeddf5bbf334408536c609f2ded245e119c1a9de17 /js/src/collapse
parent144220f0c5777e07fb1832324d52a590bec363e2 (diff)
downloadbootstrap-dcba52677556bedb04a07825c2023e0beeea6f1e.tar.xz
bootstrap-dcba52677556bedb04a07825c2023e0beeea6f1e.zip
remove underscore for static methods
Diffstat (limited to 'js/src/collapse')
-rw-r--r--js/src/collapse/collapse.js16
-rw-r--r--js/src/collapse/collapse.spec.js22
2 files changed, 19 insertions, 19 deletions
diff --git a/js/src/collapse/collapse.js b/js/src/collapse/collapse.js
index c1d9aa2f1..799085776 100644
--- a/js/src/collapse/collapse.js
+++ b/js/src/collapse/collapse.js
@@ -173,7 +173,7 @@ class Collapse {
if (actives) {
actives.forEach(elemActive => {
if (container !== elemActive) {
- Collapse._collapseInterface(elemActive, 'hide')
+ Collapse.collapseInterface(elemActive, 'hide')
}
if (!activesData) {
@@ -348,7 +348,7 @@ class Collapse {
// Static
- static _collapseInterface(element, config) {
+ static collapseInterface(element, config) {
let data = Data.getData(element, DATA_KEY)
const _config = {
...Default,
@@ -373,13 +373,13 @@ class Collapse {
}
}
- static _jQueryInterface(config) {
+ static jQueryInterface(config) {
return this.each(function () {
- Collapse._collapseInterface(this, config)
+ Collapse.collapseInterface(this, config)
})
}
- static _getInstance(element) {
+ static getInstance(element) {
return Data.getData(element, DATA_KEY)
}
}
@@ -415,7 +415,7 @@ EventHandler.on(document, Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (
config = triggerData
}
- Collapse._collapseInterface(element, config)
+ Collapse.collapseInterface(element, config)
})
})
@@ -428,11 +428,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] = Collapse._jQueryInterface
+ $.fn[NAME] = Collapse.jQueryInterface
$.fn[NAME].Constructor = Collapse
$.fn[NAME].noConflict = () => {
$.fn[NAME] = JQUERY_NO_CONFLICT
- return Collapse._jQueryInterface
+ return Collapse.jQueryInterface
}
}
diff --git a/js/src/collapse/collapse.spec.js b/js/src/collapse/collapse.spec.js
index 731b4a25f..154bc2c6b 100644
--- a/js/src/collapse/collapse.spec.js
+++ b/js/src/collapse/collapse.spec.js
@@ -366,11 +366,11 @@ describe('Collapse', () => {
toggle: false
})
- expect(Collapse._getInstance(collapseEl)).toEqual(collapse)
+ expect(Collapse.getInstance(collapseEl)).toEqual(collapse)
collapse.dispose()
- expect(Collapse._getInstance(collapseEl)).toEqual(null)
+ expect(Collapse.getInstance(collapseEl)).toEqual(null)
})
})
@@ -760,18 +760,18 @@ describe('Collapse', () => {
})
})
- describe('_jQueryInterface', () => {
+ describe('jQueryInterface', () => {
it('should create a collapse', () => {
fixtureEl.innerHTML = '<div></div>'
const div = fixtureEl.querySelector('div')
- jQueryMock.fn.collapse = Collapse._jQueryInterface
+ jQueryMock.fn.collapse = Collapse.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.collapse.call(jQueryMock)
- expect(Collapse._getInstance(div)).toBeDefined()
+ expect(Collapse.getInstance(div)).toBeDefined()
})
it('should not re create a collapse', () => {
@@ -780,12 +780,12 @@ describe('Collapse', () => {
const div = fixtureEl.querySelector('div')
const collapse = new Collapse(div)
- jQueryMock.fn.collapse = Collapse._jQueryInterface
+ jQueryMock.fn.collapse = Collapse.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.collapse.call(jQueryMock)
- expect(Collapse._getInstance(div)).toEqual(collapse)
+ expect(Collapse.getInstance(div)).toEqual(collapse)
})
it('should throw error on undefined method', () => {
@@ -794,7 +794,7 @@ describe('Collapse', () => {
const div = fixtureEl.querySelector('div')
const action = 'undefinedMethod'
- jQueryMock.fn.collapse = Collapse._jQueryInterface
+ jQueryMock.fn.collapse = Collapse.jQueryInterface
jQueryMock.elements = [div]
try {
@@ -805,14 +805,14 @@ describe('Collapse', () => {
})
})
- describe('_getInstance', () => {
+ describe('getInstance', () => {
it('should return collapse instance', () => {
fixtureEl.innerHTML = '<div></div>'
const div = fixtureEl.querySelector('div')
const collapse = new Collapse(div)
- expect(Collapse._getInstance(div)).toEqual(collapse)
+ expect(Collapse.getInstance(div)).toEqual(collapse)
})
it('should return null when there is no collapse instance', () => {
@@ -820,7 +820,7 @@ describe('Collapse', () => {
const div = fixtureEl.querySelector('div')
- expect(Collapse._getInstance(div)).toEqual(null)
+ expect(Collapse.getInstance(div)).toEqual(null)
})
})
})