aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
Diffstat (limited to 'js/src')
-rw-r--r--js/src/dropdown.js31
1 files changed, 28 insertions, 3 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 39a4a86ca..846746384 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -52,8 +52,11 @@ const Dropdown = (($) => {
}
const ClassName = {
- DISABLED : 'disabled',
- SHOW : 'show'
+ DISABLED : 'disabled',
+ SHOW : 'show',
+ DROPUP : 'dropup',
+ MENURIGHT : 'dropdown-menu-right',
+ MENULEFT : 'dropdown-menu-left'
}
const Selector = {
@@ -142,7 +145,7 @@ const Dropdown = (($) => {
}
// Handle dropup
- const dropdownPlacement = $(this._element).parent().hasClass('dropup') ? AttachmentMap.TOP : this._config.placement
+ const dropdownPlacement = $(this._element).parent().hasClass(ClassName.DROPUP) ? AttachmentMap.TOP : this._config.placement
this._popper = new Popper(this._element, this._menu, {
placement : dropdownPlacement,
modifiers : {
@@ -151,6 +154,11 @@ const Dropdown = (($) => {
},
flip : {
enabled : this._config.flip
+ },
+ beforeApplyStyle: {
+ order: 899, // 900 is the order of applyStyle
+ enabled: true,
+ fn: this._beforePopperApplyStyle
}
}
})
@@ -230,6 +238,23 @@ const Dropdown = (($) => {
return this._menu
}
+ _beforePopperApplyStyle(data) {
+ if ($(data.instance.popper).hasClass(ClassName.MENURIGHT)) {
+ data.styles = {
+ right: 0,
+ left: 'auto'
+ }
+ }
+
+ if ($(data.instance.popper).hasClass(ClassName.MENULEFT)) {
+ data.styles = {
+ right: 'auto',
+ left: 0
+ }
+ }
+ return data
+ }
+
// static
static _jQueryInterface(config) {