Skip to content

Commit

Permalink
Remove placement attribute from our Dropdown plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Johann-S committed Sep 7, 2017
1 parent 7983ba9 commit b822b5a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
10 changes: 1 addition & 9 deletions docs/4.0/components/dropdowns.md
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ Regardless of whether you call your dropdown via JavaScript or instead use the d

### Options

Options can be passed via data attributes or JavaScript. For data attributes, append the option name to `data-`, as in `data-placement=""`.
Options can be passed via data attributes or JavaScript. For data attributes, append the option name to `data-`, as in `data-offset=""`.

<table class="table table-bordered table-striped table-responsive">
<thead>
Expand All @@ -586,14 +586,6 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
</tr>
</thead>
<tbody>
<tr>
<td>placement</td>
<td>string</td>
<td>'bottom'</td>
<td>
<p>How to position the popover - top | bottom.</p>
</td>
</tr>
<tr>
<td>offset</td>
<td>number | string</td>
Expand Down
11 changes: 2 additions & 9 deletions js/src/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,11 @@ const Dropdown = (() => {
}

const Default = {
placement : AttachmentMap.BOTTOM,
offset : 0,
flip : true
}

const DefaultType = {
placement : 'string',
offset : '(number|string)',
flip : 'boolean'
}
Expand Down Expand Up @@ -203,11 +201,6 @@ const Dropdown = (() => {
}

_getConfig(config) {
const elementData = $(this._element).data()
if (typeof elementData.placement !== 'undefined') {
elementData.placement = AttachmentMap[elementData.placement.toUpperCase()]
}

config = $.extend(
{},
this.constructor.Default,
Expand All @@ -234,10 +227,10 @@ const Dropdown = (() => {

_getPlacement() {
const $parentDropdown = $(this._element).parent()
let placement = this._config.placement
let 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
Expand Down

0 comments on commit b822b5a

Please sign in to comment.