aboutsummaryrefslogtreecommitdiff
path: root/js/src/tooltip
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/tooltip
parent144220f0c5777e07fb1832324d52a590bec363e2 (diff)
downloadbootstrap-dcba52677556bedb04a07825c2023e0beeea6f1e.tar.xz
bootstrap-dcba52677556bedb04a07825c2023e0beeea6f1e.zip
remove underscore for static methods
Diffstat (limited to 'js/src/tooltip')
-rw-r--r--js/src/tooltip/tooltip.js8
-rw-r--r--js/src/tooltip/tooltip.spec.js22
2 files changed, 15 insertions, 15 deletions
diff --git a/js/src/tooltip/tooltip.js b/js/src/tooltip/tooltip.js
index 1db233e79..7575bb89d 100644
--- a/js/src/tooltip/tooltip.js
+++ b/js/src/tooltip/tooltip.js
@@ -770,7 +770,7 @@ class Tooltip {
// Static
- static _jQueryInterface(config) {
+ static jQueryInterface(config) {
return this.each(function () {
let data = Data.getData(this, DATA_KEY)
const _config = typeof config === 'object' && config
@@ -793,7 +793,7 @@ class Tooltip {
})
}
- static _getInstance(element) {
+ static getInstance(element) {
return Data.getData(element, DATA_KEY)
}
}
@@ -807,11 +807,11 @@ class Tooltip {
/* istanbul ignore if */
if (typeof $ !== 'undefined') {
const JQUERY_NO_CONFLICT = $.fn[NAME]
- $.fn[NAME] = Tooltip._jQueryInterface
+ $.fn[NAME] = Tooltip.jQueryInterface
$.fn[NAME].Constructor = Tooltip
$.fn[NAME].noConflict = () => {
$.fn[NAME] = JQUERY_NO_CONFLICT
- return Tooltip._jQueryInterface
+ return Tooltip.jQueryInterface
}
}
diff --git a/js/src/tooltip/tooltip.spec.js b/js/src/tooltip/tooltip.spec.js
index 6f02dfa9b..1e858d369 100644
--- a/js/src/tooltip/tooltip.spec.js
+++ b/js/src/tooltip/tooltip.spec.js
@@ -266,11 +266,11 @@ describe('Tooltip', () => {
const tooltipEl = fixtureEl.querySelector('a')
const tooltip = new Tooltip(tooltipEl)
- expect(Tooltip._getInstance(tooltipEl)).toEqual(tooltip)
+ expect(Tooltip.getInstance(tooltipEl)).toEqual(tooltip)
tooltip.dispose()
- expect(Tooltip._getInstance(tooltipEl)).toEqual(null)
+ expect(Tooltip.getInstance(tooltipEl)).toEqual(null)
})
it('should destroy a tooltip and remove it from the dom', done => {
@@ -926,18 +926,18 @@ describe('Tooltip', () => {
})
})
- describe('_jQueryInterface', () => {
+ describe('jQueryInterface', () => {
it('should create a tooltip', () => {
fixtureEl.innerHTML = '<div></div>'
const div = fixtureEl.querySelector('div')
- jQueryMock.fn.tooltip = Tooltip._jQueryInterface
+ jQueryMock.fn.tooltip = Tooltip.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.tooltip.call(jQueryMock)
- expect(Tooltip._getInstance(div)).toBeDefined()
+ expect(Tooltip.getInstance(div)).toBeDefined()
})
it('should not re create a tooltip', () => {
@@ -946,12 +946,12 @@ describe('Tooltip', () => {
const div = fixtureEl.querySelector('div')
const tooltip = new Tooltip(div)
- jQueryMock.fn.tooltip = Tooltip._jQueryInterface
+ jQueryMock.fn.tooltip = Tooltip.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.tooltip.call(jQueryMock)
- expect(Tooltip._getInstance(div)).toEqual(tooltip)
+ expect(Tooltip.getInstance(div)).toEqual(tooltip)
})
it('should call a tooltip method', () => {
@@ -962,12 +962,12 @@ describe('Tooltip', () => {
spyOn(tooltip, 'show')
- jQueryMock.fn.tooltip = Tooltip._jQueryInterface
+ jQueryMock.fn.tooltip = Tooltip.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.tooltip.call(jQueryMock, 'show')
- expect(Tooltip._getInstance(div)).toEqual(tooltip)
+ expect(Tooltip.getInstance(div)).toEqual(tooltip)
expect(tooltip.show).toHaveBeenCalled()
})
@@ -978,7 +978,7 @@ describe('Tooltip', () => {
spyOn(Tooltip.prototype, 'dispose')
- jQueryMock.fn.tooltip = Tooltip._jQueryInterface
+ jQueryMock.fn.tooltip = Tooltip.jQueryInterface
jQueryMock.elements = [div]
jQueryMock.fn.tooltip.call(jQueryMock, 'dispose')
@@ -992,7 +992,7 @@ describe('Tooltip', () => {
const div = fixtureEl.querySelector('div')
const action = 'undefinedMethod'
- jQueryMock.fn.tooltip = Tooltip._jQueryInterface
+ jQueryMock.fn.tooltip = Tooltip.jQueryInterface
jQueryMock.elements = [div]
try {