From 0480a75a5a40f2805d1f63dea3ec5eb5fad7f18e Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 4 Jul 2017 10:26:25 +0200
Subject: Dropdown - Disable applyStyle modifier instead of removing inline
 style applied by Popper.js

---
 js/src/dropdown.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'js/src')

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
-- 
cgit v1.2.3