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
b36d8ae6
Commit
b36d8ae6
authored
7 years ago
by
Johann-S
Committed by
GitHub
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Use popper to align dropdown menu instead of using css with important
parent
be742b0f
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
v4.1.1
v4.1.0
v4.0.0
v4.0.0-beta.3
v4.0.0-beta.2
v4.0.0-beta
6 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!25326
Adjust examples
,
!23995
Add back cursor: pointer for .btn-link
,
!23178
Spinner
,
!17021
v4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
js/src/dropdown.js
+28
-3
js/src/dropdown.js
js/tests/visual/dropdown.html
+37
-11
js/tests/visual/dropdown.html
scss/_dropdown.scss
+0
-14
scss/_dropdown.scss
with
65 additions
and
28 deletions
+65
-28
js/src/dropdown.js
+
28
-
3
View file @
b36d8ae6
...
...
@@ -52,8 +52,11 @@ const Dropdown = (($) => {
}
const
ClassName
=
{
DISABLED
:
'
disabled
'
,
SHOW
:
'
show
'
DISABLED
:
'
disabled
'
,
SHOW
:
'
show
'
,
DROPUP
:
'
dropup
'
,
MENURIGHT
:
'
dropdown-menu-right
'
,
MENULEFT
:
'
dropdown-menu-left
'
}
const
Selector
=
{
...
...
@@ -142,7 +145,7 @@ const Dropdown = (($) => {
}
// Handle dropup
const
dropdownPlacement
=
$
(
this
.
_element
).
parent
().
hasClass
(
'
dropup
'
)
?
AttachmentMap
.
TOP
:
this
.
_config
.
placement
const
dropdownPlacement
=
$
(
this
.
_element
).
parent
().
hasClass
(
ClassName
.
DROPUP
)
?
AttachmentMap
.
TOP
:
this
.
_config
.
placement
this
.
_popper
=
new
Popper
(
this
.
_element
,
this
.
_menu
,
{
placement
:
dropdownPlacement
,
modifiers
:
{
...
...
@@ -151,6 +154,11 @@ const Dropdown = (($) => {
},
flip
:
{
enabled
:
this
.
_config
.
flip
},
beforeApplyStyle
:
{
order
:
899
,
// 900 is the order of applyStyle
enabled
:
true
,
fn
:
this
.
_beforePopperApplyStyle
}
}
})
...
...
@@ -230,6 +238,23 @@ const Dropdown = (($) => {
return
this
.
_menu
}
_beforePopperApplyStyle
(
data
)
{
if
(
$
(
data
.
instance
.
popper
).
hasClass
(
ClassName
.
MENURIGHT
))
{
data
.
styles
=
{
right
:
0
,
left
:
'
auto
'
}
}
if
(
$
(
data
.
instance
.
popper
).
hasClass
(
ClassName
.
MENULEFT
))
{
data
.
styles
=
{
right
:
'
auto
'
,
left
:
0
}
}
return
data
}
// static
static
_jQueryInterface
(
config
)
{
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/dropdown.html
+
37
-
11
View file @
b36d8ae6
...
...
@@ -59,19 +59,45 @@
</li>
</ul>
<!-- Default dropup button -->
<div
class=
"btn-group dropup"
style=
"margin-top: 60px;"
>
<button
type=
"button"
class=
"btn btn-secondary"
>
Dropup
</button>
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"sr-only"
>
Toggle Dropdown
</span>
</button>
<div
class=
"dropdown-menu"
>
<a
class=
"dropdown-item"
href=
"#"
>
Action
</a>
<a
class=
"dropdown-item"
href=
"#"
>
Another action
</a>
<a
class=
"dropdown-item"
href=
"#"
>
Something else here
</a>
<div
class=
"row"
>
<div
class=
"col-sm-12 mt-4"
>
<!-- Default dropup button -->
<div
class=
"btn-group dropup"
>
<button
type=
"button"
class=
"btn btn-secondary"
>
Dropup
</button>
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"sr-only"
>
Toggle Dropdown
</span>
</button>
<div
class=
"dropdown-menu"
>
<a
class=
"dropdown-item"
href=
"#"
>
Action
</a>
<a
class=
"dropdown-item"
href=
"#"
>
Another action
</a>
<a
class=
"dropdown-item"
href=
"#"
>
Something else here
</a>
</div>
</div>
<div
class=
"btn-group"
>
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
This dropdown's menu is right-aligned
</button>
<div
class=
"dropdown-menu dropdown-menu-right"
>
<button
class=
"dropdown-item"
type=
"button"
>
Action
</button>
<button
class=
"dropdown-item"
type=
"button"
>
Another action
</button>
<button
class=
"dropdown-item"
type=
"button"
>
Something else here
</button>
</div>
</div>
<div
class=
"btn-group"
>
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
This dropdown's menu is left-aligned
</button>
<div
class=
"dropdown-menu dropdown-menu-left"
>
<button
class=
"dropdown-item"
type=
"button"
>
Action
</button>
<button
class=
"dropdown-item"
type=
"button"
>
Another action
</button>
<button
class=
"dropdown-item"
type=
"button"
>
Something else here
</button>
</div>
</div>
</div>
</div>
</div>
</div>
<script
src=
"../../../docs/assets/js/vendor/jquery-slim.min.js"
></script>
<script
src=
"../../../docs/assets/js/vendor/popper.min.js"
></script>
...
...
This diff is collapsed.
Click to expand it.
scss/_dropdown.scss
+
0
-
14
View file @
b36d8ae6
...
...
@@ -108,20 +108,6 @@
}
}
// Menu positioning
//
// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown
// menu with the parent.
.dropdown-menu-right
{
right
:
0
;
left
:
auto
!
important
;
// Reset the default from `.dropdown-menu`
}
.dropdown-menu-left
{
right
:
auto
!
important
;
left
:
0
;
}
.dropdown-menu.show
{
display
:
block
;
}
...
...
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