aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2017-07-04 10:26:25 +0200
committerJohann-S <[email protected]>2017-07-04 10:37:44 +0200
commit0480a75a5a40f2805d1f63dea3ec5eb5fad7f18e (patch)
treef1a7f139dc3cbeb1172f0366f9d1839295d9564e /js/src
parent6797e8421564c64fb8d27412e25fb8f7d7b19ca2 (diff)
downloadbootstrap-0480a75a5a40f2805d1f63dea3ec5eb5fad7f18e.tar.xz
bootstrap-0480a75a5a40f2805d1f63dea3ec5eb5fad7f18e.zip
Dropdown - Disable applyStyle modifier instead of removing inline style applied by Popper.js
Diffstat (limited to 'js/src')
-rw-r--r--js/src/dropdown.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 057cfa433..234d23447 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -265,14 +265,10 @@ const Dropdown = (($) => {
}
}
+ // Disable Popper.js for Dropdown in Navbar
if (this._inNavbar) {
- popperConfig.modifiers.AfterApplyStyle = {
- enabled: true,
- order: 901, // ApplyStyle order + 1
- fn: () => {
- // reset Popper styles
- $(this._menu).attr('style', '')
- }
+ popperConfig.modifiers.applyStyle = {
+ enabled: !this._inNavbar
}
}
return popperConfig