Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Upgrade to React 16 (#5119)

Browse source 
* Upgrade to React 16.0.0

* Disable some uncritical tests while chai-enzyme remains incompatible
This commit is contained in:
Eugen Rochko 2017-09-30 04:29:56 +02:00 • committed by GitHub
parent 0060f98847
commit ebb8c89207
11 changed files with 722 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/components/column_header.js
View file

@ -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>