diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-12-13 14:01:33 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-12-13 14:01:33 +0100 |
commit | b5937bd427e02d64b675c9c4719ec8148c68c224 (patch) | |
tree | 3e67ca01935eb36ab6d40a1e197d7c2c0f38b587 /src/components/ui/Button.js | |
parent | Update CHANGELOG.md (diff) | |
parent | Ignore clicks on premium elements (diff) | |
download | ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.tar.gz ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.tar.zst ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.zip |
Merge branch 'develop'v5.0.0-beta.21
Diffstat (limited to 'src/components/ui/Button.js')
-rw-r--r-- | src/components/ui/Button.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index 309e05bb4..ffc7f7051 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js | |||
@@ -62,6 +62,8 @@ export default @observer class Button extends Component { | |||
62 | } | 62 | } |
63 | 63 | ||
64 | return ( | 64 | return ( |
65 | // disabling rule as button has type defined in `buttonProps` | ||
66 | /* eslint-disable react/button-has-type */ | ||
65 | <button {...buttonProps}> | 67 | <button {...buttonProps}> |
66 | <Loader | 68 | <Loader |
67 | loaded={loaded} | 69 | loaded={loaded} |
@@ -72,6 +74,7 @@ export default @observer class Button extends Component { | |||
72 | /> | 74 | /> |
73 | {label} | 75 | {label} |
74 | </button> | 76 | </button> |
77 | /* eslint-enable react/button-has-type */ | ||
75 | ); | 78 | ); |
76 | } | 79 | } |
77 | } | 80 | } |