github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-02 02:55:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix buttons being given incorrect title

Browse Source
This commit is contained in:
Toby Zerner 2016-04-08 13:38:50 +09:30
parent 2a0bca218a
commit 6a0ea61c55
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/admin/dist/app.js vendored
View File

@ -17873,7 +17873,7 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
// If nothing else is provided, we use the textual button content as tooltip // If nothing else is provided, we use the textual button content as tooltip
if (!attrs.title && this.props.children) { if (!attrs.title && this.props.children) {
attrs.title = extractText(attrs.title); attrs.title = extractText(this.props.children);
} }
var iconName = extract(attrs, 'icon'); var iconName = extract(attrs, 'icon');

2
framework/core/js/forum/dist/app.js vendored
View File

@ -19196,7 +19196,7 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
// If nothing else is provided, we use the textual button content as tooltip // If nothing else is provided, we use the textual button content as tooltip
if (!attrs.title && this.props.children) { if (!attrs.title && this.props.children) {
attrs.title = extractText(attrs.title); attrs.title = extractText(this.props.children);
} }
var iconName = extract(attrs, 'icon'); var iconName = extract(attrs, 'icon');

2
framework/core/js/lib/components/Button.js
View File

@ -31,7 +31,7 @@ export default class Button extends Component {
// If nothing else is provided, we use the textual button content as tooltip // If nothing else is provided, we use the textual button content as tooltip
if (!attrs.title && this.props.children) { if (!attrs.title && this.props.children) {
attrs.title = extractText(attrs.title); attrs.title = extractText(this.props.children);
} }
const iconName = extract(attrs, 'icon'); const iconName = extract(attrs, 'icon');