github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-13 07:03:35 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Flattening items breaks things; recurse to get the first element instead

Browse Source
This commit is contained in:
Toby Zerner 2015-06-26 13:52:54 +09:30
parent f2a28e1185
commit c81cb5dcc8
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/js/lib/components/dropdown-split.js
View File

@ -10,7 +10,11 @@ import ActionButton from 'flarum/components/action-button';
*/ */
export default class DropdownSplit extends Component { export default class DropdownSplit extends Component {
view() { view() {
var firstItem = this.props.items[0]; var firstItem = this.props.items;
while (firstItem instanceof Array) {
firstItem = firstItem[0];
}
var items = listItems(this.props.items); var items = listItems(this.props.items);
var buttonProps = {}; var buttonProps = {};

9
framework/core/js/lib/utils/item-list.js
View File

@ -64,15 +64,6 @@ export default class ItemList {
array = array.map(item => item.content); array = array.map(item => item.content);
//recursively flatten array
for (var i = 0, len = array.length; i < len; i++) {
if (array[i] instanceof Array) {
array = array.concat.apply([], array);
i-- //check current index again and flatten until there are no more nested arrays at that index
len = array.length;
}
}
return array; return array;
} }
} }