mirror of
https://github.com/flarum/core.git
synced 2025-08-14 04:14:06 +02:00
Compare commits
4 Commits
dk/DISCUSS
...
release/v1
Author | SHA1 | Date | |
---|---|---|---|
|
a0ce859e21 | ||
|
ff72afa601 | ||
|
4894f34249 | ||
|
e3069d861a |
@@ -1,5 +1,9 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [v1.7.2](https://github.com/flarum/framework/compare/v1.7.1...v1.7.2)
|
||||||
|
### Fixed
|
||||||
|
- empty string displayed as SelectDropdown title (#3773)
|
||||||
|
|
||||||
## [v1.7.1](https://github.com/flarum/framework/compare/v1.7.0...v1.7.1)
|
## [v1.7.1](https://github.com/flarum/framework/compare/v1.7.0...v1.7.1)
|
||||||
### Fixed
|
### Fixed
|
||||||
- (tags) composer tag selection modal using wrong primary max & min numbers (abc9670659426b765274376945b818b70d84848c)
|
- (tags) composer tag selection modal using wrong primary max & min numbers (abc9670659426b765274376945b818b70d84848c)
|
||||||
|
2
framework/core/js/dist/admin.js
generated
vendored
2
framework/core/js/dist/admin.js
generated
vendored
File diff suppressed because one or more lines are too long
2
framework/core/js/dist/admin.js.map
generated
vendored
2
framework/core/js/dist/admin.js.map
generated
vendored
File diff suppressed because one or more lines are too long
2
framework/core/js/dist/forum.js
generated
vendored
2
framework/core/js/dist/forum.js
generated
vendored
File diff suppressed because one or more lines are too long
2
framework/core/js/dist/forum.js.map
generated
vendored
2
framework/core/js/dist/forum.js.map
generated
vendored
File diff suppressed because one or more lines are too long
@@ -1,6 +1,5 @@
|
|||||||
import Dropdown, { IDropdownAttrs } from './Dropdown';
|
import Dropdown, { IDropdownAttrs } from './Dropdown';
|
||||||
import icon from '../helpers/icon';
|
import icon from '../helpers/icon';
|
||||||
import extractText from '../utils/extractText';
|
|
||||||
import classList from '../utils/classList';
|
import classList from '../utils/classList';
|
||||||
import type Component from '../Component';
|
import type Component from '../Component';
|
||||||
import type Mithril from 'mithril';
|
import type Mithril from 'mithril';
|
||||||
@@ -50,7 +49,8 @@ export default class SelectDropdown<CustomAttrs extends ISelectDropdownAttrs = I
|
|||||||
const activeChild = children.find(isActive);
|
const activeChild = children.find(isActive);
|
||||||
let label = (activeChild && typeof activeChild === 'object' && 'children' in activeChild && activeChild.children) || this.attrs.defaultLabel;
|
let label = (activeChild && typeof activeChild === 'object' && 'children' in activeChild && activeChild.children) || this.attrs.defaultLabel;
|
||||||
|
|
||||||
label = extractText(label);
|
// @ts-ignore
|
||||||
|
if (Array.isArray(label)) label = label[0];
|
||||||
|
|
||||||
return [<span className="Button-label">{label}</span>, this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : null];
|
return [<span className="Button-label">{label}</span>, this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : null];
|
||||||
}
|
}
|
||||||
|
@@ -21,7 +21,7 @@ class Application
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
const VERSION = '1.7.1';
|
const VERSION = '1.7.2';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The IoC container for the Flarum application.
|
* The IoC container for the Flarum application.
|
||||||
|
Reference in New Issue
Block a user