diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-30 04:29:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-30 04:29:56 +0200 |
commit | ebb8c8920795a31a3188d39b926a5074bb8b69cf (patch) | |
tree | 3e8ece4055bd97ec1f4a47c12085936cc4fc4275 /app/javascript/mastodon/components/column_header.js | |
parent | 0060f988478e54cb1b54b255d06376fd9fa265b1 (diff) |
Upgrade to React 16 (#5119)
* Upgrade to React 16.0.0 * Disable some uncritical tests while chai-enzyme remains incompatible
Diffstat (limited to 'app/javascript/mastodon/components/column_header.js')
-rw-r--r-- | app/javascript/mastodon/components/column_header.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js index 05e1de705..e4fa8fa7a 100644 --- a/app/javascript/mastodon/components/column_header.js +++ b/app/javascript/mastodon/components/column_header.js @@ -135,7 +135,7 @@ export default class ColumnHeader extends React.PureComponent { return ( <div className={wrapperClassName}> - <h1 tabIndex={focusable && '0'} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}> + <h1 tabIndex={focusable ? 0 : null} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}> <i className={`fa fa-fw fa-${icon} column-header__icon`} /> {title} @@ -145,7 +145,7 @@ export default class ColumnHeader extends React.PureComponent { </div> </h1> - <div className={collapsibleClassName} tabIndex={collapsed && -1} onTransitionEnd={this.handleTransitionEnd}> + <div className={collapsibleClassName} tabIndex={collapsed ? -1 : null} onTransitionEnd={this.handleTransitionEnd}> <div className='column-header__collapsible-inner'> {(!collapsed || animating) && collapsedContent} </div> |