diff options
author | Mark Otto <markdotto@gmail.com> | 2017-07-04 21:55:16 +0300 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2017-07-04 21:55:16 +0300 |
commit | 2a745e54decaf4dffe5d09ee57f5ce43f8105549 (patch) | |
tree | f1d9897140e5f6432b10f7ecd704e12b066a6658 /js/dist/dropdown.js | |
parent | a662f85398ffe67453c773ec94a94e2607cb4a36 (diff) |
npm build
Diffstat (limited to 'js/dist/dropdown.js')
-rw-r--r-- | js/dist/dropdown.js | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/js/dist/dropdown.js b/js/dist/dropdown.js index d81f291627..94c506b557 100644 --- a/js/dist/dropdown.js +++ b/js/dist/dropdown.js @@ -231,8 +231,6 @@ var Dropdown = function ($) { }; Dropdown.prototype._getPopperConfig = function _getPopperConfig() { - var _this2 = this; - var popperConfig = { placement: this._getPlacement(), modifiers: { @@ -245,14 +243,10 @@ var Dropdown = function ($) { } }; + // Disable Popper.js for Dropdown in Navbar if (this._inNavbar) { - popperConfig.modifiers.AfterApplyStyle = { - enabled: true, - order: 901, // ApplyStyle order + 1 - fn: function fn() { - // reset Popper styles - $(_this2._menu).attr('style', ''); - } + popperConfig.modifiers.applyStyle = { + enabled: !this._inNavbar }; } return popperConfig; |