mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 06:44:35 +02:00
Code Issues Releases Wiki Activity

fix(manipulator): increase coverage for manipulator

Browse Source
This commit is contained in:
Johann-S
2018-06-09 21:11:05 +02:00
committed by XhmikosR
parent 4d6e41dea6
commit 64591b3722
12 changed files with 286 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/modal.js
View File

@@ -473,7 +473,7 @@ class Modal {
// Restore fixed content padding
Util.makeArray(SelectorEngine.find(Selector.FIXED_CONTENT))
.forEach((element) => {
const padding = Util.getDataAttribute(element, 'padding-right')
const padding = Manipulator.getDataAttribute(element, 'padding-right')
if (typeof padding !== 'undefined') {
Manipulator.removeDataAttribute(element, 'padding-right')
element.style.paddingRight = padding
@@ -483,7 +483,7 @@ class Modal {
// Restore sticky content and navbar-toggler margin
Util.makeArray(SelectorEngine.find(`${Selector.STICKY_CONTENT}`))
.forEach((element) => {
const margin = Util.getDataAttribute(element, 'margin-right')
const margin = Manipulator.getDataAttribute(element, 'margin-right')
if (typeof margin !== 'undefined') {
Manipulator.removeDataAttribute(element, 'margin-right')
element.style.marginRight = margin
@@ -491,17 +491,13 @@ class Modal {
})
// Restore body padding
const padding = Util.getDataAttribute(document.body, 'padding-right')
const padding = Manipulator.getDataAttribute(document.body, 'padding-right')
if (typeof padding !== 'undefined') {
Manipulator.removeDataAttribute(document.body, 'padding-right')
document.body.style.paddingRight = padding
} else {
document.body.style.paddingRight = ''
}
static _getInstance(element) {
return Data.getData(element, DATA_KEY)
}
}
_getScrollbarWidth() { // thx d.walsh
@@ -520,7 +516,7 @@ class Modal {
let data = Data.getData(this, DATA_KEY)
const _config = {
...Default,
...Util.getDataAttributes(this),
...Manipulator.getDataAttributes(this),
...typeof config === 'object' && config ? config : {}
}
@@ -539,6 +535,10 @@ class Modal {
}
})
}
static _getInstance(element) {
return Data.getData(element, DATA_KEY)
}
}
/**
@@ -557,8 +557,8 @@ EventHandler.on(document, Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (
const config = Data.getData(target, DATA_KEY)
? 'toggle' : {
...Util.getDataAttributes(target),
...Util.getDataAttributes(this)
...Manipulator.getDataAttributes(target),
...Manipulator.getDataAttributes(this)
}
if (this.tagName === 'A' || this.tagName === 'AREA') {