diff options
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r-- | dist/js/bootstrap.js | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 27e76a9e66..a1340f4350 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1501,30 +1501,33 @@ var Dropdown = function ($$$1) { if (showEvent.isDefaultPrevented()) { return; - } - /** - * Check for Popper dependency - * Popper - https://popper.js.org - */ + } // Disable totally Popper.js for Dropdown in Navbar - if (typeof Popper === 'undefined') { - throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)'); - } + if (!this._inNavbar) { + /** + * Check for Popper dependency + * Popper - https://popper.js.org + */ + if (typeof Popper === 'undefined') { + throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)'); + } - var element = this._element; // for dropup with alignment we use the parent as popper container + var element = this._element; // for dropup with alignment we use the parent as popper container - if ($$$1(parent).hasClass(ClassName.DROPUP)) { - if ($$$1(this._menu).hasClass(ClassName.MENULEFT) || $$$1(this._menu).hasClass(ClassName.MENURIGHT)) { - element = parent; + if ($$$1(parent).hasClass(ClassName.DROPUP)) { + if ($$$1(this._menu).hasClass(ClassName.MENULEFT) || $$$1(this._menu).hasClass(ClassName.MENURIGHT)) { + element = parent; + } } - } - this._popper = new Popper(element, this._menu, this._getPopperConfig()); // if this is a touch-enabled device we add extra + this._popper = new Popper(element, this._menu, this._getPopperConfig()); + } // if this is a touch-enabled device we add extra // empty mouseover listeners to the body's immediate children; // only needed because of broken event delegation on iOS // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html + if ('ontouchstart' in document.documentElement && !$$$1(parent).closest(Selector.NAVBAR_NAV).length) { $$$1('body').children().on('mouseover', null, $$$1.noop); } @@ -1545,9 +1548,9 @@ var Dropdown = function ($$$1) { if (this._popper !== null) { this._popper.destroy(); - } - this._popper = null; + this._popper = null; + } }; _proto.update = function update() { @@ -1632,16 +1635,8 @@ var Dropdown = function ($$$1) { flip: { enabled: this._config.flip } - } // Disable Popper.js for Dropdown in Navbar - + } }; - - if (this._inNavbar) { - popperConfig.modifiers.applyStyle = { - enabled: !this._inNavbar - }; - } - return popperConfig; }; // static |