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
b1eb3fcc
Commit
b1eb3fcc
authored
6 years ago
by
Johann-S
Browse files
Options
Download
Email Patches
Plain Diff
refactor(plugins): improve how we query elements
parent
62cc0fda
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
feat/data-target
floating-always-visible
floating-labels-icons
fod-main-banner
form-controls-with-icons
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
v4-dev
v4-dev-dropdown-hide-method
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
v5.0.0-alpha3
v5.0.0-alpha2
v5.0.0-alpha1
v4.6.2
v4.6.1
v4.6.0
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.1
v4.4.0
v4.3.1
v4.3.0
v4.2.1
v4.2.0
v4.1.3
v4.1.2
2 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
js/src/carousel.js
+4
-3
js/src/carousel.js
js/src/collapse.js
+14
-12
js/src/collapse.js
js/src/dropdown.js
+2
-2
js/src/dropdown.js
js/src/modal.js
+8
-4
js/src/modal.js
js/src/scrollspy.js
+5
-3
js/src/scrollspy.js
js/src/util.js
+1
-2
js/src/util.js
with
34 additions
and
26 deletions
+34
-26
js/src/carousel.js
+
4
-
3
View file @
b1eb3fcc
...
...
@@ -492,10 +492,11 @@ const Carousel = (($) => {
.
on
(
Event
.
CLICK_DATA_API
,
Selector
.
DATA_SLIDE
,
Carousel
.
_dataApiClickHandler
)
$
(
window
).
on
(
Event
.
LOAD_DATA_API
,
()
=>
{
$
(
Selector
.
DATA_RIDE
).
each
(
function
()
{
const
$carousel
=
$
(
this
)
const
carousels
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
DATA_RIDE
))
for
(
let
i
=
0
,
len
=
carousels
.
length
;
i
<
len
;
i
++
)
{
const
$carousel
=
$
(
carousels
[
i
])
Carousel
.
_jQueryInterface
.
call
(
$carousel
,
$carousel
.
data
())
}
)
}
})
/**
...
...
This diff is collapsed.
Click to expand it.
js/src/collapse.js
+
14
-
12
View file @
b1eb3fcc
...
...
@@ -72,11 +72,14 @@ const Collapse = (($) => {
`[data-toggle="collapse"][href="#
${
element
.
id
}
"],`
+
`[data-toggle="collapse"][data-target="#
${
element
.
id
}
"]`
))
const
t
abT
oggle
s
=
$
(
Selector
.
DATA_TOGGLE
)
for
(
let
i
=
0
;
i
<
tabT
oggle
s
.
length
;
i
++
)
{
const
elem
=
t
abT
oggle
s
[
i
]
const
toggle
List
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
DATA_TOGGLE
)
)
for
(
let
i
=
0
,
len
=
t
oggle
List
.
length
;
i
<
len
;
i
++
)
{
const
elem
=
toggle
List
[
i
]
const
selector
=
Util
.
getSelectorFromElement
(
elem
)
if
(
selector
!==
null
&&
$
(
selector
).
filter
(
element
).
length
>
0
)
{
const
filterElement
=
[].
slice
.
call
(
document
.
querySelectorAll
(
selector
))
.
filter
((
foundElem
)
=>
foundElem
===
element
)
if
(
selector
!==
null
&&
filterElement
.
length
>
0
)
{
this
.
_selector
=
selector
this
.
_triggerArray
.
push
(
elem
)
}
...
...
@@ -123,11 +126,9 @@ const Collapse = (($) => {
let
activesData
if
(
this
.
_parent
)
{
actives
=
$
.
makeArray
(
$
(
this
.
_parent
)
.
find
(
Selector
.
ACTIVES
)
.
filter
(
`[data-parent="
${
this
.
_config
.
parent
}
"]`
)
)
actives
=
[].
slice
.
call
(
this
.
_parent
.
querySelectorAll
(
Selector
.
ACTIVES
))
.
filter
((
elem
)
=>
elem
.
getAttribute
(
'
data-parent
'
)
===
this
.
_config
.
parent
)
if
(
actives
.
length
===
0
)
{
actives
=
null
}
...
...
@@ -216,12 +217,13 @@ const Collapse = (($) => {
.
removeClass
(
ClassName
.
COLLAPSE
)
.
removeClass
(
ClassName
.
SHOW
)
if
(
this
.
_triggerArray
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
this
.
_triggerArray
.
length
;
i
++
)
{
const
triggerArrayLength
=
this
.
_triggerArray
.
length
if
(
triggerArrayLength
>
0
)
{
for
(
let
i
=
0
;
i
<
triggerArrayLength
;
i
++
)
{
const
trigger
=
this
.
_triggerArray
[
i
]
const
selector
=
Util
.
getSelectorFromElement
(
trigger
)
if
(
selector
!==
null
)
{
const
$elem
=
$
(
selector
)
const
$elem
=
$
(
[].
slice
.
call
(
document
.
querySelectorAll
(
selector
)
))
if
(
!
$elem
.
hasClass
(
ClassName
.
SHOW
))
{
$
(
trigger
).
addClass
(
ClassName
.
COLLAPSED
)
.
attr
(
'
aria-expanded
'
,
false
)
...
...
This diff is collapsed.
Click to expand it.
js/src/dropdown.js
+
2
-
2
View file @
b1eb3fcc
...
...
@@ -333,8 +333,8 @@ const Dropdown = (($) => {
return
}
const
toggles
=
$
.
makeArray
(
$
(
Selector
.
DATA_TOGGLE
))
for
(
let
i
=
0
;
i
<
toggles
.
length
;
i
++
)
{
const
toggles
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
DATA_TOGGLE
))
for
(
let
i
=
0
,
len
=
toggles
.
length
;
i
<
len
;
i
++
)
{
const
parent
=
Dropdown
.
_getParentFromElement
(
toggles
[
i
])
const
context
=
$
(
toggles
[
i
]).
data
(
DATA_KEY
)
const
relatedTarget
=
{
...
...
This diff is collapsed.
Click to expand it.
js/src/modal.js
+
8
-
4
View file @
b1eb3fcc
...
...
@@ -430,23 +430,26 @@ const Modal = (($) => {
if
(
this
.
_isBodyOverflowing
)
{
// Note: DOMNode.style.paddingRight returns the actual value or '' if not set
// while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set
const
fixedContent
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
FIXED_CONTENT
))
const
stickyContent
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
STICKY_CONTENT
))
const
navbarToggler
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
NAVBAR_TOGGLER
))
// Adjust fixed content padding
$
(
Selector
.
FIXED_CONTENT
).
each
((
index
,
element
)
=>
{
$
(
fixedContent
).
each
((
index
,
element
)
=>
{
const
actualPadding
=
$
(
element
)[
0
].
style
.
paddingRight
const
calculatedPadding
=
$
(
element
).
css
(
'
padding-right
'
)
$
(
element
).
data
(
'
padding-right
'
,
actualPadding
).
css
(
'
padding-right
'
,
`
${
parseFloat
(
calculatedPadding
)
+
this
.
_scrollbarWidth
}
px`
)
})
// Adjust sticky content margin
$
(
Selector
.
STICKY_CONTENT
).
each
((
index
,
element
)
=>
{
$
(
stickyContent
).
each
((
index
,
element
)
=>
{
const
actualMargin
=
$
(
element
)[
0
].
style
.
marginRight
const
calculatedMargin
=
$
(
element
).
css
(
'
margin-right
'
)
$
(
element
).
data
(
'
margin-right
'
,
actualMargin
).
css
(
'
margin-right
'
,
`
${
parseFloat
(
calculatedMargin
)
-
this
.
_scrollbarWidth
}
px`
)
})
// Adjust navbar-toggler margin
$
(
Selector
.
NAVBAR_TOGGLER
).
each
((
index
,
element
)
=>
{
$
(
navbarToggler
).
each
((
index
,
element
)
=>
{
const
actualMargin
=
$
(
element
)[
0
].
style
.
marginRight
const
calculatedMargin
=
$
(
element
).
css
(
'
margin-right
'
)
$
(
element
).
data
(
'
margin-right
'
,
actualMargin
).
css
(
'
margin-right
'
,
`
${
parseFloat
(
calculatedMargin
)
+
this
.
_scrollbarWidth
}
px`
)
...
...
@@ -461,7 +464,8 @@ const Modal = (($) => {
_resetScrollbar
()
{
// Restore fixed content padding
$
(
Selector
.
FIXED_CONTENT
).
each
((
index
,
element
)
=>
{
const
fixedContent
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
FIXED_CONTENT
))
$
(
fixedContent
).
each
((
index
,
element
)
=>
{
const
padding
=
$
(
element
).
data
(
'
padding-right
'
)
if
(
typeof
padding
!==
'
undefined
'
)
{
$
(
element
).
css
(
'
padding-right
'
,
padding
).
removeData
(
'
padding-right
'
)
...
...
This diff is collapsed.
Click to expand it.
js/src/scrollspy.js
+
5
-
3
View file @
b1eb3fcc
...
...
@@ -225,7 +225,8 @@ const ScrollSpy = (($) => {
return
}
for
(
let
i
=
this
.
_offsets
.
length
;
i
--
;)
{
const
offsetLength
=
this
.
_offsets
.
length
for
(
let
i
=
offsetLength
;
i
--
;)
{
const
isActiveTarget
=
this
.
_activeTarget
!==
this
.
_targets
[
i
]
&&
scrollTop
>=
this
.
_offsets
[
i
]
&&
(
typeof
this
.
_offsets
[
i
+
1
]
===
'
undefined
'
||
...
...
@@ -302,9 +303,10 @@ const ScrollSpy = (($) => {
*/
$
(
window
).
on
(
Event
.
LOAD_DATA_API
,
()
=>
{
const
scrollSpys
=
$
.
makeArray
(
$
(
Selector
.
DATA_SPY
))
const
scrollSpys
=
[].
slice
.
call
(
document
.
querySelectorAll
(
Selector
.
DATA_SPY
))
for
(
let
i
=
scrollSpys
.
length
;
i
--
;)
{
const
scrollSpysLength
=
scrollSpys
.
length
for
(
let
i
=
scrollSpysLength
;
i
--
;)
{
const
$spy
=
$
(
scrollSpys
[
i
])
ScrollSpy
.
_jQueryInterface
.
call
(
$spy
,
$spy
.
data
())
}
...
...
This diff is collapsed.
Click to expand it.
js/src/util.js
+
1
-
2
View file @
b1eb3fcc
...
...
@@ -82,8 +82,7 @@ const Util = (($) => {
}
try
{
const
$selector
=
$
(
document
).
find
(
selector
)
return
$selector
.
length
>
0
?
selector
:
null
return
document
.
querySelector
(
selector
)
?
selector
:
null
}
catch
(
err
)
{
return
null
}
...
...
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