diff options
| author | Mark Otto <[email protected]> | 2017-06-16 21:28:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-06-16 21:28:29 -0700 |
| commit | c5170db84467abf3a901d7e8df21d8e84a987743 (patch) | |
| tree | c3ef43762b43d22ab93eb7be44d2a22192325e69 /js/src | |
| parent | 9fe8f94341f44ed9cfa2d9fdf73f442229fe7517 (diff) | |
| parent | 9f0929013e0c4e5c21acbb7a7e8298c345ea4cac (diff) | |
| download | bootstrap-c5170db84467abf3a901d7e8df21d8e84a987743.tar.xz bootstrap-c5170db84467abf3a901d7e8df21d8e84a987743.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/dropdown.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index acc3ed453..4ed0210a5 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -250,12 +250,10 @@ const Dropdown = (($) => { if ($(this._menu).hasClass(ClassName.MENURIGHT)) { placement = AttachmentMap.TOPEND } + } else if ($(this._menu).hasClass(ClassName.MENURIGHT)) { + placement = AttachmentMap.BOTTOMEND } - else { - if ($(this._menu).hasClass(ClassName.MENURIGHT)) { - placement = AttachmentMap.BOTTOMEND - } - } + return placement } |