tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put "Media Only" option in column settings instead of content area headline (#7801)

Browse Source 
* Action/reducer for changing column settings takes a path and a value
instead of a javascript object

* Settings menu version and column headline version working simultaneously

* remove column headline entirely

* remove css for headlines that aren't possible now

* Remove commented out code from unfruitful attempt at this feature

* Give direct timeline its own column settings bc it doesn't have a media only option

* Fix typo in public timeline code that was preventing per-column settings from working properly

* Fix codeclimate issues

* Missing semicolons

* Use redux state to set onlyMedia, let that do the update instead of a callback. Consequently, unpinned setting works without history modification

* Unused import
This commit is contained in:
chr v1.x
2018-06-15 02:15:15 -07:00
committed by Eugen Rochko
parent f972815f1b
commit 4f42238c29
11 changed files with 125 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/direct_timeline/containers/column_settings_container.js
View File

@ -1,5 +1,5 @@
import { connect } from 'react-redux';
import ColumnSettings from '../../community_timeline/components/column_settings';
import ColumnSettings from '../components/column_settings';
import { changeSetting } from '../../../actions/settings';
const mapStateToProps = state => ({