IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6999 Stopped mutating style object provided by react-bootstrap (#6869)

Browse Source 
* PLT-6999 Stopped mutating style object provided by react-bootstrap

* Fixed indentation to satisfy eslint
This commit is contained in:
Harrison Healey
2017-07-07 19:25:26 -04:00
committed by Saturnino Abril
parent 15ad24d160
commit 0bb4add8a1
1 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
webapp/components/emoji_picker/emoji_picker.jsx
View File

@@ -309,7 +309,7 @@ export default class EmojiPicker extends React.Component {
right: this.props.rightOffset
};
} else {
pickerStyle = this.props.style;
pickerStyle = {...this.props.style};
}
}
@@ -325,91 +325,111 @@ export default class EmojiPicker extends React.Component {
<div className='emoji-picker__categories'>
<EmojiPickerCategory
category='recent'
icon={<i
className='fa fa-clock-o'
title={Utils.localizeMessage('emoji_picker.recent', 'Recently Used')}
/>}
icon={
<i
className='fa fa-clock-o'
title={Utils.localizeMessage('emoji_picker.recent', 'Recently Used')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'recent'}
/>
<EmojiPickerCategory
category='people'
icon={<i
className='fa fa-smile-o'
title={Utils.localizeMessage('emoji_picker.people', 'People')}
/>}
icon={
<i
className='fa fa-smile-o'
title={Utils.localizeMessage('emoji_picker.people', 'People')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'people'}
/>
<EmojiPickerCategory
category='nature'
icon={<i
className='fa fa-leaf'
title={Utils.localizeMessage('emoji_picker.nature', 'Nature')}
/>}
icon={
<i
className='fa fa-leaf'
title={Utils.localizeMessage('emoji_picker.nature', 'Nature')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'nature'}
/>
<EmojiPickerCategory
category='food'
icon={<i
className='fa fa-cutlery'
title={Utils.localizeMessage('emoji_picker.food', 'Food')}
/>}
icon={
<i
className='fa fa-cutlery'
title={Utils.localizeMessage('emoji_picker.food', 'Food')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'food'}
/>
<EmojiPickerCategory
category='activity'
icon={<i
className='fa fa-futbol-o'
title={Utils.localizeMessage('emoji_picker.activity', 'Activity')}
/>}
icon={
<i
className='fa fa-futbol-o'
title={Utils.localizeMessage('emoji_picker.activity', 'Activity')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'activity'}
/>
<EmojiPickerCategory
category='travel'
icon={<i
className='fa fa-plane'
title={Utils.localizeMessage('emoji_picker.travel', 'Travel')}
/>}
icon={
<i
className='fa fa-plane'
title={Utils.localizeMessage('emoji_picker.travel', 'Travel')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'travel'}
/>
<EmojiPickerCategory
category='objects'
icon={<i
className='fa fa-lightbulb-o'
title={Utils.localizeMessage('emoji_picker.objects', 'Objects')}
/>}
icon={
<i
className='fa fa-lightbulb-o'
title={Utils.localizeMessage('emoji_picker.objects', 'Objects')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'objects'}
/>
<EmojiPickerCategory
category='symbols'
icon={<i
className='fa fa-heart-o'
title={Utils.localizeMessage('emoji_picker.symbols', 'Symbols')}
/>}
icon={
<i
className='fa fa-heart-o'
title={Utils.localizeMessage('emoji_picker.symbols', 'Symbols')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'symbols'}
/>
<EmojiPickerCategory
category='flags'
icon={<i
className='fa fa-flag-o'
title={Utils.localizeMessage('emoji_picker.flags', 'Flags')}
/>}
icon={
<i
className='fa fa-flag-o'
title={Utils.localizeMessage('emoji_picker.flags', 'Flags')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'flags'}
/>
<EmojiPickerCategory
category='custom'
icon={<i
className='fa fa-at'
title={Utils.localizeMessage('emoji_picker.custom', 'Custom')}
/>}
icon={
<i
className='fa fa-at'
title={Utils.localizeMessage('emoji_picker.custom', 'Custom')}
/>
}
onCategoryClick={this.handleCategoryClick}
selected={this.state.category === 'custom'}
/>