mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 04:55:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)

Browse Source 
Fix username styling regression introduced in #1063
Fix report screen background regression introduced in #1415
This commit is contained in:
Eugen 2017-04-13 19:36:41 +02:00 committed by GitHub
parent 043862f411
commit ac54da9394
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/components/actions/reports.jsx
View File

@ -7,7 +7,8 @@ export const REPORT_SUBMIT_REQUEST = 'REPORT_SUBMIT_REQUEST';
export const REPORT_SUBMIT_SUCCESS = 'REPORT_SUBMIT_SUCCESS'; export const REPORT_SUBMIT_SUCCESS = 'REPORT_SUBMIT_SUCCESS';
export const REPORT_SUBMIT_FAIL = 'REPORT_SUBMIT_FAIL'; export const REPORT_SUBMIT_FAIL = 'REPORT_SUBMIT_FAIL';
export const REPORT_STATUS_TOGGLE = 'REPORT_STATUS_TOGGLE'; export const REPORT_STATUS_TOGGLE = 'REPORT_STATUS_TOGGLE';
export const REPORT_COMMENT_CHANGE = 'REPORT_COMMENT_CHANGE';
export function initReport(account, status) { export function initReport(account, status) {
return { return {
@ -62,3 +63,10 @@ export function submitReportFail(error) {
error error
}; };
}; };
export function changeReportComment(comment) {
return {
type: REPORT_COMMENT_CHANGE,
comment
};
};

2
app/assets/javascripts/components/features/notifications/components/column_settings.jsx
View File

@ -27,7 +27,7 @@ const ColumnSettings = React.createClass({
propTypes: { propTypes: {
settings: ImmutablePropTypes.map.isRequired, settings: ImmutablePropTypes.map.isRequired,
intl: ImmutablePropTypes.object.isRequired, intl: React.PropTypes.object.isRequired,
onChange: React.PropTypes.func.isRequired, onChange: React.PropTypes.func.isRequired,
onSave: React.PropTypes.func.isRequired, onSave: React.PropTypes.func.isRequired,
}, },

7
app/assets/javascripts/components/features/report/index.jsx
View File

@ -47,7 +47,7 @@ const Report = React.createClass({
propTypes: { propTypes: {
isSubmitting: React.PropTypes.bool, isSubmitting: React.PropTypes.bool,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.map,
statusIds: ImmutablePropTypes.list.isRequired, statusIds: ImmutablePropTypes.orderedSet.isRequired,
comment: React.PropTypes.string.isRequired, comment: React.PropTypes.string.isRequired,
dispatch: React.PropTypes.func.isRequired, dispatch: React.PropTypes.func.isRequired,
intl: React.PropTypes.object.isRequired intl: React.PropTypes.object.isRequired
@ -94,7 +94,8 @@ const Report = React.createClass({
return ( return (
<Column heading={intl.formatMessage(messages.heading)} icon='flag'> <Column heading={intl.formatMessage(messages.heading)} icon='flag'>
<ColumnBackButtonSlim /> <ColumnBackButtonSlim />
<div className='report' style={{ display: 'flex', flexDirection: 'column', maxHeight: '100%', boxSizing: 'border-box' }}>
<div className='report scrollable' style={{ display: 'flex', flexDirection: 'column', maxHeight: '100%', boxSizing: 'border-box' }}>
<div className='report__target' style={{ flex: '0 0 auto', padding: '10px' }}> <div className='report__target' style={{ flex: '0 0 auto', padding: '10px' }}>
<FormattedMessage id='report.target' defaultMessage='Reporting' /> <FormattedMessage id='report.target' defaultMessage='Reporting' />
<strong>{account.get('acct')}</strong> <strong>{account.get('acct')}</strong>
@ -106,7 +107,7 @@ const Report = React.createClass({
</div> </div>
</div> </div>
<div style={{ flex: '0 0 160px', padding: '10px' }}> <div style={{ flex: '0 0 100px', padding: '10px' }}>
<textarea <textarea
className='report__textarea' className='report__textarea'
placeholder={intl.formatMessage(messages.placeholder)} placeholder={intl.formatMessage(messages.placeholder)}

5
app/assets/javascripts/components/reducers/reports.jsx
View File

@ -4,7 +4,8 @@ import {
REPORT_SUBMIT_SUCCESS, REPORT_SUBMIT_SUCCESS,
REPORT_SUBMIT_FAIL, REPORT_SUBMIT_FAIL,
REPORT_CANCEL, REPORT_CANCEL,
REPORT_STATUS_TOGGLE REPORT_STATUS_TOGGLE,
REPORT_COMMENT_CHANGE
} from '../actions/reports'; } from '../actions/reports';
import Immutable from 'immutable'; import Immutable from 'immutable';
@ -39,6 +40,8 @@ export default function reports(state = initialState, action) {
return set.remove(action.statusId); return set.remove(action.statusId);
}); });
case REPORT_COMMENT_CHANGE:
return state.setIn(['new', 'comment'], action.comment);
case REPORT_SUBMIT_REQUEST: case REPORT_SUBMIT_REQUEST:
return state.setIn(['new', 'isSubmitting'], true); return state.setIn(['new', 'isSubmitting'], true);
case REPORT_SUBMIT_FAIL: case REPORT_SUBMIT_FAIL:

2
app/lib/formatter.rb
View File

@ -96,6 +96,6 @@ class Formatter
end end
def mention_html(match, account) def mention_html(match, account)
"#{match.split('@').first}<span class=\"h-card\"><a href=\"#{TagManager.instance.url_for(account)}\" class=\"u-url mention\">@#{account.username}</a></span>" "#{match.split('@').first}<span class=\"h-card\"><a href=\"#{TagManager.instance.url_for(account)}\" class=\"u-url mention\">@<span>#{account.username}</span></a></span>"
end end
end end