diff options
author | Mark Otto <markdotto@gmail.com> | 2017-09-10 02:59:37 +0300 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2017-09-10 02:59:37 +0300 |
commit | d8a5147c380fe142ee97fa2489f05afe2ed5a614 (patch) | |
tree | 1025945777bfd6a17aa433c6277a7821a68aa62d /js/dist/dropdown.js | |
parent | cad22335ede2d2d9d0242f86cd859752bbfb14ea (diff) |
dist
Diffstat (limited to 'js/dist/dropdown.js')
-rw-r--r-- | js/dist/dropdown.js | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/js/dist/dropdown.js b/js/dist/dropdown.js index 39096759c6..9e53c88290 100644 --- a/js/dist/dropdown.js +++ b/js/dist/dropdown.js @@ -78,23 +78,21 @@ var Dropdown = function () { }; var Default = { - placement: AttachmentMap.BOTTOM, offset: 0, flip: true }; var DefaultType = { - placement: 'string', offset: '(number|string)', flip: 'boolean' + }; - /** - * ------------------------------------------------------------------------ - * Class Definition - * ------------------------------------------------------------------------ - */ + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ - }; var Dropdown = function () { function Dropdown(element, config) { _classCallCheck(this, Dropdown); @@ -201,11 +199,6 @@ var Dropdown = function () { }, { key: '_getConfig', value: function _getConfig(config) { - var elementData = $(this._element).data(); - if (typeof elementData.placement !== 'undefined') { - elementData.placement = AttachmentMap[elementData.placement.toUpperCase()]; - } - config = $.extend({}, this.constructor.Default, $(this._element).data(), config); Util.typeCheckConfig(NAME, config, this.constructor.DefaultType); @@ -225,10 +218,10 @@ var Dropdown = function () { key: '_getPlacement', value: function _getPlacement() { var $parentDropdown = $(this._element).parent(); - var placement = this._config.placement; + var placement = AttachmentMap.BOTTOM; // Handle dropup - if ($parentDropdown.hasClass(ClassName.DROPUP) || this._config.placement === AttachmentMap.TOP) { + if ($parentDropdown.hasClass(ClassName.DROPUP)) { placement = AttachmentMap.TOP; if ($(this._menu).hasClass(ClassName.MENURIGHT)) { placement = AttachmentMap.TOPEND; @@ -256,9 +249,10 @@ var Dropdown = function () { enabled: this._config.flip } } + }; - // Disable Popper.js for Dropdown in Navbar - };if (this._inNavbar) { + // Disable Popper.js for Dropdown in Navbar + if (this._inNavbar) { popperConfig.modifiers.applyStyle = { enabled: !this._inNavbar }; |