]> cat aescling's git repositories - mastodon.git/commitdiff
Make detect empty string before assign image description (#5994)
authorNeetshin <neetshin@neetsh.in>
Tue, 12 Dec 2017 18:57:22 +0000 (18:57 +0000)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 12 Dec 2017 18:57:22 +0000 (19:57 +0100)
* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

app/javascript/mastodon/features/compose/components/upload.js

index 6ab76492a91f79eba226a2f8a8ff227dc022b569..3a3d17710086a8636e4c7111386950186ce18ce5 100644 (file)
@@ -62,7 +62,7 @@ export default class Upload extends ImmutablePureComponent {
   render () {
     const { intl, media } = this.props;
     const active          = this.state.hovered || this.state.focused;
-    const description     = this.state.dirtyDescription || media.get('description') || '';
+    const description     = this.state.dirtyDescription || (this.state.dirtyDescription !== '' && media.get('description')) || '';
 
     return (
       <div className='compose-form__upload' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>