Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
2e758f64
Commit
2e758f64
authored
4 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Switch to Number properties
parent
b9f7668c
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
floating-always-visible
floating-labels-icons
fod-main-banner
github/fork/719media/patch-13
github/fork/719media/patch-14
github/fork/719media/patch-9
github/fork/ChellyAhmed/fix-typo-reboot.md
github/fork/ChellyAhmed/offcanvas-scroll-back
github/fork/CtrlAltLilith/main
github/fork/Elysiome/offcanvas-optional-window-resizing
github/fork/JanSargsyan/main
github/fork/LunicLynx/support-different-line-height-for-buttons
github/fork/Psixodelik/main
github/fork/Ronid1/ronid1/offcanvas_static_backdrop
github/fork/RyanBerliner/tooltip-accessibility
github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item
github/fork/Sir-Genius/utils
github/fork/Sumit-Singh-8/main
github/fork/Viktor-VERA2020/offcanvas-slide
github/fork/Zivangu9/input-group-for-form-control-plaintext
github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation
github/fork/astagi/fix/tree-shake-modules
github/fork/compnerd/dark-accordion-icon
github/fork/derSascha/dropdown-dont-close-on-input-click
github/fork/dev-ph1l/main
github/fork/donquixote/issue-33861-utl-mixin
github/fork/florianlacreuse/mixin-make-row-gutter-y
github/fork/gregorw/main
github/fork/iteggmbh/transitionend-dispose-race
github/fork/jdelStrother/patch-1
github/fork/jonnysp/form-floating
github/fork/jonnysp/independent-offcanvas
github/fork/jonnysp/theme-dark-on-card-and-modal-fix
github/fork/josefdlange/floating-label-placeholder-opacity
github/fork/julien-deramond/enhance-change-version.js
github/fork/julien-deramond/main-jd-fix-offset-content
github/fork/julien-deramond/main-jd-issue-with-utitlies
github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements
github/fork/kyletsang/fix-tooltip-padding
github/fork/lacutah/CheckboxCenteringDocumentation
github/fork/lekoala/patch-3
github/fork/louismaximepiton/main-kld-lmp-collapse-proposal
github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix
github/fork/louismaximepiton/main-lmp-carousel-multiple-images
github/fork/louismaximepiton/main-lmp-css-var-init
github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix
github/fork/louismaximepiton/main-lmp-input-range-fix
github/fork/louismaximepiton/main-lmp-shift-color
github/fork/louismaximepiton/main-lmp-table-active-tr-fix
github/fork/maciek-szn/switch
github/fork/michael-roth/feature/19964-multiple-tab-targets
github/fork/mistic100/dom-utils
github/fork/nkdas91/accordion
github/fork/nstungcom/fix-missing-modal-open-class
github/fork/oraliahdz/animation-utilities
github/fork/pine3ree/patch-7
github/fork/pouwerkerk/unindent-scss-docs-shortcode
github/fork/smares/smares-no-scolling-on-modal-close
github/fork/tgm-git/patch-1
gs-forms
gs-toasts-with-animated-progress-bar
gs/add-history-helper
gs/change-version-dir-on-docs
gs/data-must-set-onlu-one-instance
gs/docs/fix-drop-down-error
gs/event-handler-2
gs/make-docs-js-build
gs/make-simple-attribute-toggler
gs/popover-fix-doc
gs/provide-steConfig-method
gs/scrollspy-smoothscroll-option-use-browser-history
gs/streamline-jqueryInterface
gs/support-drop-down-in-navbar
gs/test-js-generic-trigger
gs/try-web-components
gs/tweak-collapse-js-selector
gs/use-event-handler-in-cocmponent
gs/use-rollup-replace-for-version
jo-docs-thanks-page
jo-ssr-friendly
logical-props-spacing-utils
main-fod-disabled-form-check-label
main-fod-nested-accordion
main-fod-simpler-table-structure
main-fod-table-separator
main-fod-utilities-contrast
main-jd-abbr-title
main-jd-add-chips
main-jd-add-doc-for-sass-custom-colors
main-jd-add-enable-host-to-handle-web-components
main-jd-browserstack-fine-tune
main-jd-browserstack-updates
main-jd-docs-consistent-usage-of-css-sections-step-2
main-jd-fix-docs-headers-in-white
main-jd-fix-highlight-docs-border-radius
main-jd-fix-placeholder-color-background-params-for-img-markup
main-jd-glossary-experiment
main-jd-postcss-drop-empty-css-vars
main-jd-proto-doc-astro
main-jd-skip-navigation-component
main-jd-stackblitz-for-examples
main-jd-upgrade-browserlistrc
main-jd-use-host
main-lmp-dark-theme-customization
main-lmp-handle-scroll-target
main-lmp-tab-fix
main-mc-opensearch
main-xmr-bundlewatch-action
main-xmr-eslint-plugin-compat
main-xmr-hugo-docs-vendor
main-xmr-hugo-rm-ver
main-xmr-linkinator-prod
main-xmr-min-mangle
main-xmr-pa11y-ci
more-darkmode-examples
nested-dropdowns
patrickhlauke-issue37428
patrickhlauke-use-of-color-tweaks
pr/34102
pr/37590
previous-next-docs-links
sticky-thead
utilities-functions-mixin
v530-dev
v6-postcss-custom-media
v6-spinner-dots
v6/gs/use-floating-ui-in-place-of-popper
xmr/dev
xmr/docs-png
xmr/docs-svgs
xmr/hugo-reorg-files
xmr/js-2
xmr/markdownlint
xmr/prepare-530-alpha2
xmr/xo
v5.3.0-alpha1
v5.2.3
v5.2.2
v5.2.1
v5.2.0
v5.2.0-beta1
v5.1.3
v5.1.2
v5.1.1
v5.1.0
v5.0.2
v5.0.1
v5.0.0
v5.0.0-beta3
v5.0.0-beta2
v5.0.0-beta1
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.eslintrc.json
+0
-1
.eslintrc.json
js/src/carousel.js
+1
-1
js/src/carousel.js
js/src/modal.js
+3
-3
js/src/modal.js
js/src/util/index.js
+3
-3
js/src/util/index.js
js/tests/unit/modal.spec.js
+6
-6
js/tests/unit/modal.spec.js
with
13 additions
and
14 deletions
+13
-14
.eslintrc.json
+
0
-
1
View file @
2e758f64
...
...
@@ -53,7 +53,6 @@
"unicorn/prefer-dataset"
:
"off"
,
"unicorn/prefer-node-append"
:
"off"
,
"unicorn/prefer-node-remove"
:
"off"
,
"unicorn/prefer-number-properties"
:
"off"
,
"unicorn/prefer-optional-catch-binding"
:
"off"
,
"unicorn/prefer-query-selector"
:
"off"
,
"unicorn/prefer-set-has"
:
"off"
,
...
...
This diff is collapsed.
Click to expand it.
js/src/carousel.js
+
1
-
1
View file @
2e758f64
...
...
@@ -419,7 +419,7 @@ class Carousel {
return
}
const
elementInterval
=
parseInt
(
element
.
getAttribute
(
'
data-bs-interval
'
),
10
)
const
elementInterval
=
Number
.
parseInt
(
element
.
getAttribute
(
'
data-bs-interval
'
),
10
)
if
(
elementInterval
)
{
this
.
_config
.
defaultInterval
=
this
.
_config
.
defaultInterval
||
this
.
_config
.
interval
...
...
This diff is collapsed.
Click to expand it.
js/src/modal.js
+
3
-
3
View file @
2e758f64
...
...
@@ -474,7 +474,7 @@ class Modal {
const
actualPadding
=
element
.
style
.
paddingRight
const
calculatedPadding
=
window
.
getComputedStyle
(
element
)[
'
padding-right
'
]
Manipulator
.
setDataAttribute
(
element
,
'
bs-padding-right
'
,
actualPadding
)
element
.
style
.
paddingRight
=
`
${
parseFloat
(
calculatedPadding
)
+
this
.
_scrollbarWidth
}
px`
element
.
style
.
paddingRight
=
`
${
Number
.
parseFloat
(
calculatedPadding
)
+
this
.
_scrollbarWidth
}
px`
})
// Adjust sticky content margin
...
...
@@ -483,7 +483,7 @@ class Modal {
const
actualMargin
=
element
.
style
.
marginRight
const
calculatedMargin
=
window
.
getComputedStyle
(
element
)[
'
margin-right
'
]
Manipulator
.
setDataAttribute
(
element
,
'
bs-margin-right
'
,
actualMargin
)
element
.
style
.
marginRight
=
`
${
parseFloat
(
calculatedMargin
)
-
this
.
_scrollbarWidth
}
px`
element
.
style
.
marginRight
=
`
${
Number
.
parseFloat
(
calculatedMargin
)
-
this
.
_scrollbarWidth
}
px`
})
// Adjust body padding
...
...
@@ -491,7 +491,7 @@ class Modal {
const
calculatedPadding
=
window
.
getComputedStyle
(
document
.
body
)[
'
padding-right
'
]
Manipulator
.
setDataAttribute
(
document
.
body
,
'
bs-padding-right
'
,
actualPadding
)
document
.
body
.
style
.
paddingRight
=
`
${
parseFloat
(
calculatedPadding
)
+
this
.
_scrollbarWidth
}
px`
document
.
body
.
style
.
paddingRight
=
`
${
Number
.
parseFloat
(
calculatedPadding
)
+
this
.
_scrollbarWidth
}
px`
}
document
.
body
.
classList
.
add
(
CLASS_NAME_OPEN
)
...
...
This diff is collapsed.
Click to expand it.
js/src/util/index.js
+
3
-
3
View file @
2e758f64
...
...
@@ -71,8 +71,8 @@ const getTransitionDurationFromElement = element => {
transitionDelay
}
=
window
.
getComputedStyle
(
element
)
const
floatTransitionDuration
=
parseFloat
(
transitionDuration
)
const
floatTransitionDelay
=
parseFloat
(
transitionDelay
)
const
floatTransitionDuration
=
Number
.
parseFloat
(
transitionDuration
)
const
floatTransitionDelay
=
Number
.
parseFloat
(
transitionDelay
)
// Return 0 if element or transition duration is not found
if
(
!
floatTransitionDuration
&&
!
floatTransitionDelay
)
{
...
...
@@ -83,7 +83,7 @@ const getTransitionDurationFromElement = element => {
transitionDuration
=
transitionDuration
.
split
(
'
,
'
)[
0
]
transitionDelay
=
transitionDelay
.
split
(
'
,
'
)[
0
]
return
(
parseFloat
(
transitionDuration
)
+
parseFloat
(
transitionDelay
))
*
MILLISECONDS_MULTIPLIER
return
(
Number
.
parseFloat
(
transitionDuration
)
+
Number
.
parseFloat
(
transitionDelay
))
*
MILLISECONDS_MULTIPLIER
}
const
triggerTransitionEnd
=
element
=>
{
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/modal.spec.js
+
6
-
6
View file @
2e758f64
...
...
@@ -87,13 +87,13 @@ describe('Modal', () => {
].
join
(
''
)
const
fixedEl
=
fixtureEl
.
querySelector
(
'
.fixed-top
'
)
const
originalPadding
=
parseInt
(
window
.
getComputedStyle
(
fixedEl
).
paddingRight
,
10
)
const
originalPadding
=
Number
.
parseInt
(
window
.
getComputedStyle
(
fixedEl
).
paddingRight
,
10
)
const
modalEl
=
fixtureEl
.
querySelector
(
'
.modal
'
)
const
modal
=
new
Modal
(
modalEl
)
modalEl
.
addEventListener
(
'
shown.bs.modal
'
,
()
=>
{
const
expectedPadding
=
originalPadding
+
modal
.
_getScrollbarWidth
()
const
currentPadding
=
parseInt
(
window
.
getComputedStyle
(
modalEl
).
paddingRight
,
10
)
const
currentPadding
=
Number
.
parseInt
(
window
.
getComputedStyle
(
modalEl
).
paddingRight
,
10
)
expect
(
fixedEl
.
getAttribute
(
'
data-bs-padding-right
'
)).
toEqual
(
'
0px
'
,
'
original fixed element padding should be stored in data-bs-padding-right
'
)
expect
(
currentPadding
).
toEqual
(
expectedPadding
,
'
fixed element padding should be adjusted while opening
'
)
...
...
@@ -101,7 +101,7 @@ describe('Modal', () => {
})
modalEl
.
addEventListener
(
'
hidden.bs.modal
'
,
()
=>
{
const
currentPadding
=
parseInt
(
window
.
getComputedStyle
(
modalEl
).
paddingRight
,
10
)
const
currentPadding
=
Number
.
parseInt
(
window
.
getComputedStyle
(
modalEl
).
paddingRight
,
10
)
expect
(
fixedEl
.
getAttribute
(
'
data-bs-padding-right
'
)).
toEqual
(
null
,
'
data-bs-padding-right should be cleared after closing
'
)
expect
(
currentPadding
).
toEqual
(
originalPadding
,
'
fixed element padding should be reset after closing
'
)
...
...
@@ -118,13 +118,13 @@ describe('Modal', () => {
].
join
(
''
)
const
stickyTopEl
=
fixtureEl
.
querySelector
(
'
.sticky-top
'
)
const
originalMargin
=
parseInt
(
window
.
getComputedStyle
(
stickyTopEl
).
marginRight
,
10
)
const
originalMargin
=
Number
.
parseInt
(
window
.
getComputedStyle
(
stickyTopEl
).
marginRight
,
10
)
const
modalEl
=
fixtureEl
.
querySelector
(
'
.modal
'
)
const
modal
=
new
Modal
(
modalEl
)
modalEl
.
addEventListener
(
'
shown.bs.modal
'
,
()
=>
{
const
expectedMargin
=
originalMargin
-
modal
.
_getScrollbarWidth
()
const
currentMargin
=
parseInt
(
window
.
getComputedStyle
(
stickyTopEl
).
marginRight
,
10
)
const
currentMargin
=
Number
.
parseInt
(
window
.
getComputedStyle
(
stickyTopEl
).
marginRight
,
10
)
expect
(
stickyTopEl
.
getAttribute
(
'
data-bs-margin-right
'
)).
toEqual
(
'
0px
'
,
'
original sticky element margin should be stored in data-bs-margin-right
'
)
expect
(
currentMargin
).
toEqual
(
expectedMargin
,
'
sticky element margin should be adjusted while opening
'
)
...
...
@@ -132,7 +132,7 @@ describe('Modal', () => {
})
modalEl
.
addEventListener
(
'
hidden.bs.modal
'
,
()
=>
{
const
currentMargin
=
parseInt
(
window
.
getComputedStyle
(
stickyTopEl
).
marginRight
,
10
)
const
currentMargin
=
Number
.
parseInt
(
window
.
getComputedStyle
(
stickyTopEl
).
marginRight
,
10
)
expect
(
stickyTopEl
.
getAttribute
(
'
data-bs-margin-right
'
)).
toEqual
(
null
,
'
data-bs-margin-right should be cleared after closing
'
)
expect
(
currentMargin
).
toEqual
(
originalMargin
,
'
sticky element margin should be reset after closing
'
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets