diff options
| author | enahum <nahumhbl@gmail.com> | 2016-12-05 10:19:12 -0300 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-12-05 08:19:12 -0500 |
| commit | 145876681f03f68d2fcdd4f0339f6b2b9f7b9958 (patch) | |
| tree | a1d46412813338d5e9453e3fc515dd52188cef91 /webapp/components/emoji | |
| parent | 05783664cd91e278913db5504e60bb8bc2992cb6 (diff) | |
| download | chat-145876681f03f68d2fcdd4f0339f6b2b9f7b9958.tar.gz chat-145876681f03f68d2fcdd4f0339f6b2b9f7b9958.tar.bz2 chat-145876681f03f68d2fcdd4f0339f6b2b9f7b9958.zip | |
Fix react warnings and part of backstage (#4706)
Diffstat (limited to 'webapp/components/emoji')
| -rw-r--r-- | webapp/components/emoji/components/add_emoji.jsx | 8 | ||||
| -rw-r--r-- | webapp/components/emoji/components/emoji_list.jsx | 78 |
2 files changed, 50 insertions, 36 deletions
diff --git a/webapp/components/emoji/components/add_emoji.jsx b/webapp/components/emoji/components/add_emoji.jsx index d859da0df..e496e42a0 100644 --- a/webapp/components/emoji/components/add_emoji.jsx +++ b/webapp/components/emoji/components/add_emoji.jsx @@ -14,13 +14,13 @@ import SpinnerButton from 'components/spinner_button.jsx'; export default class AddEmoji extends React.Component { static propTypes = { - team: React.PropTypes.object.isRequired, - user: React.PropTypes.object.isRequired - } + team: React.PropTypes.object, + user: React.PropTypes.object + }; static contextTypes = { router: React.PropTypes.object.isRequired - } + }; constructor(props) { super(props); diff --git a/webapp/components/emoji/components/emoji_list.jsx b/webapp/components/emoji/components/emoji_list.jsx index a539a5537..949c74c45 100644 --- a/webapp/components/emoji/components/emoji_list.jsx +++ b/webapp/components/emoji/components/emoji_list.jsx @@ -19,8 +19,8 @@ import {FormattedMessage} from 'react-intl'; export default class EmojiList extends React.Component { static get propTypes() { return { - team: React.propTypes.object.isRequired, - user: React.propTypes.object.isRequired + team: React.PropTypes.object, + user: React.PropTypes.object }; } @@ -95,11 +95,21 @@ export default class EmojiList extends React.Component { const emojis = []; if (this.state.loading) { emojis.push( - <LoadingScreen key='loading'/> + <tr + key='loading' + className='backstage-list__item backstage-list__empty' + > + <td colSpan='4'> + <LoadingScreen key='loading'/> + </td> + </tr> ); - } else if (this.state.emojis.length === 0) { + } else if (this.state.emojis.size === 0) { emojis.push( - <tr className='backstage-list__item backstage-list__empty'> + <tr + key='empty' + className='backstage-list__item backstage-list__empty' + > <td colSpan='4'> <FormattedMessage id='emoji_list.empty' @@ -180,33 +190,37 @@ export default class EmojiList extends React.Component { </span> <div className='backstage-list'> <table className='emoji-list__table'> - <tr className='backstage-list__item emoji-list__table-header'> - <th className='emoji-list__name'> - <FormattedMessage - id='emoji_list.name' - defaultMessage='Name' - /> - </th> - <th className='emoji-list__image'> - <FormattedMessage - id='emoji_list.image' - defaultMessage='Image' - /> - </th> - <th className='emoji-list__creator'> - <FormattedMessage - id='emoji_list.creator' - defaultMessage='Creator' - /> - </th> - <th className='emoji-list_actions'> - <FormattedMessage - id='emoji_list.actions' - defaultMessage='Actions' - /> - </th> - </tr> - {emojis} + <thead> + <tr className='backstage-list__item emoji-list__table-header'> + <th className='emoji-list__name'> + <FormattedMessage + id='emoji_list.name' + defaultMessage='Name' + /> + </th> + <th className='emoji-list__image'> + <FormattedMessage + id='emoji_list.image' + defaultMessage='Image' + /> + </th> + <th className='emoji-list__creator'> + <FormattedMessage + id='emoji_list.creator' + defaultMessage='Creator' + /> + </th> + <th className='emoji-list_actions'> + <FormattedMessage + id='emoji_list.actions' + defaultMessage='Actions' + /> + </th> + </tr> + </thead> + <tbody> + {emojis} + </tbody> </table> </div> </div> |