mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

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

Просмотр исходного кода 
* PLT-6999 Stopped mutating style object provided by react-bootstrap

* Fixed indentation to satisfy eslint
Этот коммит содержится в:
Harrison Healey
2017-07-07 19:25:26 -04:00
коммит произвёл Saturnino Abril
родитель 15ad24d160
Коммит 0bb4add8a1
1 изменённых файлов: 61 добавлений и 41 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

102
webapp/components/emoji_picker/emoji_picker.jsx
Просмотреть файл

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