mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 09:26:34 +02:00
Code Issues Releases Wiki Activity

Merge branch 'mithril-2-update' of github.com:flarum/core into mithril-2-update

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-08-09 19:42:17 -04:00
committed by Franz Liedke
parent 23d95a7566 e55867acb4
commit 02acacfdcb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/common/components/Button.js
View File

@@ -45,7 +45,7 @@ export default class Button extends Component {
delete attrs.onclick; delete attrs.onclick;
} }
attrs.className = classList([attrs.className, iconName && 'hasIcon', attrs.disabled && 'disabled', loading && 'loading']); attrs.className = classList([attrs.className, iconName && 'hasIcon', (attrs.disabled || loading) && 'disabled', loading && 'loading']);
return <button {...attrs}>{this.getButtonContent(vnode.children)}</button>; return <button {...attrs}>{this.getButtonContent(vnode.children)}</button>;
} }