diff --git a/app/assets/javascripts/components/features/compose/components/unlisted_toggle.jsx b/app/assets/javascripts/components/features/compose/components/unlisted_toggle.jsx
new file mode 100644
index 0000000000..0745051ebb
--- /dev/null
+++ b/app/assets/javascripts/components/features/compose/components/unlisted_toggle.jsx
@@ -0,0 +1,32 @@
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import { FormattedMessage } from 'react-intl';
+import Toggle from 'react-toggle';
+import Collapsable from '../../../components/collapsable';
+
+const UnlistedToggle = React.createClass({
+
+ propTypes: {
+ isPrivate: React.PropTypes.bool,
+ isUnlisted: React.PropTypes.bool,
+ isReplyToOther: React.PropTypes.bool,
+ onChangeListability: React.PropTypes.func.isRequired
+ },
+
+ mixins: [PureRenderMixin],
+
+ render () {
+ const { isPrivate, isUnlisted, isReplyToOther, onChangeListability } = this.props;
+
+ return (
+
+
+
+ );
+ }
+
+});
+
+export default UnlistedToggle;
diff --git a/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx b/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx
index 2671ea618b..bff273c15c 100644
--- a/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx
+++ b/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx
@@ -3,7 +3,6 @@ import ComposeForm from '../components/compose_form';
import {
changeCompose,
submitCompose,
- cancelReplyCompose,
clearComposeSuggestions,
fetchComposeSuggestions,
selectComposeSuggestion,
@@ -13,83 +12,69 @@ import {
changeComposeVisibility,
changeComposeListability
} from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-const makeMapStateToProps = () => {
- const getStatus = makeGetStatus();
+const mapStateToProps = (state, props) => {
+ const mentionedUsernamesWithDomains = state.getIn(['compose', 'text']).match(/(?:^|[^\/\w])@([a-z0-9_]+@[a-z0-9\.\-]+)/ig);
- const mapStateToProps = function (state, props) {
- const mentionedUsernamesWithDomains = state.getIn(['compose', 'text']).match(/(?:^|[^\/\w])@([a-z0-9_]+@[a-z0-9\.\-]+)/ig);
-
- return {
- text: state.getIn(['compose', 'text']),
- suggestion_token: state.getIn(['compose', 'suggestion_token']),
- suggestions: state.getIn(['compose', 'suggestions']),
- sensitive: state.getIn(['compose', 'sensitive']),
- spoiler: state.getIn(['compose', 'spoiler']),
- spoiler_text: state.getIn(['compose', 'spoiler_text']),
- unlisted: state.getIn(['compose', 'unlisted'], ),
- private: state.getIn(['compose', 'private']),
- fileDropDate: state.getIn(['compose', 'fileDropDate']),
- is_submitting: state.getIn(['compose', 'is_submitting']),
- is_uploading: state.getIn(['compose', 'is_uploading']),
- in_reply_to: getStatus(state, state.getIn(['compose', 'in_reply_to'])),
- media_count: state.getIn(['compose', 'media_attachments']).size,
- me: state.getIn(['compose', 'me']),
- needsPrivacyWarning: state.getIn(['compose', 'private']) && mentionedUsernamesWithDomains !== null,
- mentionedDomains: mentionedUsernamesWithDomains !== null ? [...new Set(mentionedUsernamesWithDomains.map(item => item.split('@')[2]))] : []
- };
- };
-
- return mapStateToProps;
-};
-
-const mapDispatchToProps = function (dispatch) {
return {
- onChange (text) {
- dispatch(changeCompose(text));
- },
-
- onSubmit () {
- dispatch(submitCompose());
- },
-
- onCancelReply () {
- dispatch(cancelReplyCompose());
- },
-
- onClearSuggestions () {
- dispatch(clearComposeSuggestions());
- },
-
- onFetchSuggestions (token) {
- dispatch(fetchComposeSuggestions(token));
- },
-
- onSuggestionSelected (position, token, accountId) {
- dispatch(selectComposeSuggestion(position, token, accountId));
- },
-
- onChangeSensitivity (checked) {
- dispatch(changeComposeSensitivity(checked));
- },
-
- onChangeSpoilerness (checked) {
- dispatch(changeComposeSpoilerness(checked));
- },
-
- onChangeSpoilerText (checked) {
- dispatch(changeComposeSpoilerText(checked));
- },
-
- onChangeVisibility (checked) {
- dispatch(changeComposeVisibility(checked));
- },
-
- onChangeListability (checked) {
- dispatch(changeComposeListability(checked));
- }
- }
+ text: state.getIn(['compose', 'text']),
+ suggestion_token: state.getIn(['compose', 'suggestion_token']),
+ suggestions: state.getIn(['compose', 'suggestions']),
+ sensitive: state.getIn(['compose', 'sensitive']),
+ spoiler: state.getIn(['compose', 'spoiler']),
+ spoiler_text: state.getIn(['compose', 'spoiler_text']),
+ unlisted: state.getIn(['compose', 'unlisted'], ),
+ private: state.getIn(['compose', 'private']),
+ fileDropDate: state.getIn(['compose', 'fileDropDate']),
+ focusDate: state.getIn(['compose', 'focusDate']),
+ preselectDate: state.getIn(['compose', 'preselectDate']),
+ is_submitting: state.getIn(['compose', 'is_submitting']),
+ is_uploading: state.getIn(['compose', 'is_uploading']),
+ media_count: state.getIn(['compose', 'media_attachments']).size,
+ me: state.getIn(['compose', 'me']),
+ needsPrivacyWarning: state.getIn(['compose', 'private']) && mentionedUsernamesWithDomains !== null,
+ mentionedDomains: mentionedUsernamesWithDomains !== null ? [...new Set(mentionedUsernamesWithDomains.map(item => item.split('@')[2]))] : []
+ };
};
-export default connect(makeMapStateToProps, mapDispatchToProps)(ComposeForm);
+const mapDispatchToProps = (dispatch) => ({
+
+ onChange (text) {
+ dispatch(changeCompose(text));
+ },
+
+ onSubmit () {
+ dispatch(submitCompose());
+ },
+
+ onClearSuggestions () {
+ dispatch(clearComposeSuggestions());
+ },
+
+ onFetchSuggestions (token) {
+ dispatch(fetchComposeSuggestions(token));
+ },
+
+ onSuggestionSelected (position, token, accountId) {
+ dispatch(selectComposeSuggestion(position, token, accountId));
+ },
+
+ onChangeSensitivity (checked) {
+ dispatch(changeComposeSensitivity(checked));
+ },
+
+ onChangeSpoilerness (checked) {
+ dispatch(changeComposeSpoilerness(checked));
+ },
+
+ onChangeSpoilerText (checked) {
+ dispatch(changeComposeSpoilerText(checked));
+ },
+
+ onChangeVisibility (checked) {
+ dispatch(changeComposeVisibility(checked));
+ },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);
diff --git a/app/assets/javascripts/components/features/compose/containers/reply_indicator_container.jsx b/app/assets/javascripts/components/features/compose/containers/reply_indicator_container.jsx
new file mode 100644
index 0000000000..39b48f3b6b
--- /dev/null
+++ b/app/assets/javascripts/components/features/compose/containers/reply_indicator_container.jsx
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { cancelReplyCompose } from '../../../actions/compose';
+import { makeGetStatus } from '../../../selectors';
+import ReplyIndicator from '../components/reply_indicator';
+
+const makeMapStateToProps = () => {
+ const getStatus = makeGetStatus();
+
+ const mapStateToProps = (state, props) => ({
+ status: getStatus(state, state.getIn(['compose', 'in_reply_to'])),
+ });
+
+ return mapStateToProps;
+};
+
+const mapDispatchToProps = dispatch => ({
+
+ onCancel () {
+ dispatch(cancelReplyCompose());
+ }
+
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
diff --git a/app/assets/javascripts/components/features/compose/containers/unlisted_toggle_container.jsx b/app/assets/javascripts/components/features/compose/containers/unlisted_toggle_container.jsx
new file mode 100644
index 0000000000..ceac903d98
--- /dev/null
+++ b/app/assets/javascripts/components/features/compose/containers/unlisted_toggle_container.jsx
@@ -0,0 +1,31 @@
+import { connect } from 'react-redux';
+import UnlistedToggle from '../components/unlisted_toggle';
+import { makeGetStatus } from '../../../selectors';
+import { changeComposeListability } from '../../../actions/compose';
+
+const makeMapStateToProps = () => {
+ const getStatus = makeGetStatus();
+
+ const mapStateToProps = state => {
+ const status = getStatus(state, state.getIn(['compose', 'in_reply_to']));
+ const me = state.getIn(['compose', 'me']);
+
+ return {
+ isPrivate: state.getIn(['compose', 'private']),
+ isUnlisted: state.getIn(['compose', 'unlisted']),
+ isReplyToOther: status ? status.getIn(['account', 'id']) !== me : false
+ };
+ };
+
+ return mapStateToProps;
+};
+
+const mapDispatchToProps = dispatch => ({
+
+ onChangeListability (e) {
+ dispatch(changeComposeListability(e.target.checked));
+ }
+
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(UnlistedToggle);
diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
index c185d7eb05..bb6df1133b 100644
--- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
+++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
@@ -54,12 +54,12 @@ const mapDispatchToProps = (dispatch, { type, id }) => ({
dispatch(expandTimeline(type, id));
},
- @debounce(300)
+ @debounce(100)
onScrollToTop () {
dispatch(scrollTopTimeline(type, true));
},
- @debounce(500)
+ @debounce(100)
onScroll () {
dispatch(scrollTopTimeline(type, false));
}
diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx
index 8d281048e1..e401a2d988 100644
--- a/app/assets/javascripts/components/reducers/compose.jsx
+++ b/app/assets/javascripts/components/reducers/compose.jsx
@@ -35,6 +35,8 @@ const initialState = Immutable.Map({
private: false,
text: '',
fileDropDate: null,
+ focusDate: null,
+ preselectDate: null,
in_reply_to: null,
is_submitting: false,
is_uploading: false,
@@ -99,6 +101,7 @@ const insertSuggestion = (state, position, token, completion) => {
map.update('text', oldText => `${oldText.slice(0, position)}${completion} ${oldText.slice(position + token.length)}`);
map.set('suggestion_token', null);
map.update('suggestions', Immutable.List(), list => list.clear());
+ map.set('focusDate', new Date());
});
};
@@ -128,6 +131,8 @@ export default function compose(state = initialState, action) {
map.set('text', statusToTextMentions(state, action.status));
map.set('unlisted', action.status.get('visibility') === 'unlisted' || state.get('default_privacy') === 'unlisted');
map.set('private', action.status.get('visibility') === 'private' || state.get('default_privacy') === 'private');
+ map.set('focusDate', new Date());
+ map.set('preselectDate', new Date());
});
case COMPOSE_REPLY_CANCEL:
return state.withMutations(map => {
@@ -156,7 +161,7 @@ export default function compose(state = initialState, action) {
case COMPOSE_UPLOAD_PROGRESS:
return state.set('progress', Math.round((action.loaded / action.total) * 100));
case COMPOSE_MENTION:
- return state.update('text', text => `${text}@${action.account.get('acct')} `);
+ return state.update('text', text => `${text}@${action.account.get('acct')} `).set('focusDate', new Date());
case COMPOSE_SUGGESTIONS_CLEAR:
return state.update('suggestions', Immutable.List(), list => list.clear()).set('suggestion_token', null);
case COMPOSE_SUGGESTIONS_READY:
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index ffb49be78b..6472ac6a01 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -249,6 +249,7 @@ const resetTimeline = (state, timeline, id) => {
.set('isLoading', true)
.set('loaded', false)
.set('next', null)
+ .set('top', true)
.update('items', list => list.clear()));
} else {
state = state.setIn([timeline, 'isLoading'], true);
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 4b6bfca489..1d2b789bbf 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -1080,7 +1080,7 @@ button.active i.fa-retweet {
flex: 0 0 auto;
cursor: pointer;
- &.active {
+ &.active .fa {
color: $color4;
text-shadow: 0 0 10px rgba($color4, 0.4);
}