Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Save onlyMedia prop when pinning column (#7575)

Browse source
This commit is contained in:
Eugen Rochko 2018-05-21 17:49:10 +02:00 • committed by GitHub
parent 40ef46dbef
commit 5ea643b279
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/ui/components/columns_area.js
View file

@ -175,10 +175,11 @@ export default class ColumnsArea extends ImmutablePureComponent {
<div className={`columns-area ${ isModalOpen ? 'unscrollable' : '' }`} ref={this.setRef}>
{columns.map(column => {
const params = column.get('params', null) === null ? null : column.get('params').toJS();
const other = params && params.other ? params.other : {};
return (
<BundleContainer key={column.get('uuid')} fetchComponent={componentMap[column.get('id')]} loading={this.renderLoading(column.get('id'))} error={this.renderError}>
{SpecificComponent => <SpecificComponent columnId={column.get('uuid')} params={params} multiColumn />}
{SpecificComponent => <SpecificComponent columnId={column.get('uuid')} params={params} multiColumn {...other} />}
</BundleContainer>
);
})}