Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2017-04-11 20:43:56 +02:00
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions

View File

@ -31,7 +31,7 @@ const IconButton = React.createClass({
e.preventDefault(); e.preventDefault();
if (!this.props.disabled) { if (!this.props.disabled) {
this.props.onClick(); this.props.onClick(e);
} }
}, },

View File

@ -27,6 +27,7 @@ const Status = React.createClass({
onOpenMedia: React.PropTypes.func, onOpenMedia: React.PropTypes.func,
onBlock: React.PropTypes.func, onBlock: React.PropTypes.func,
me: React.PropTypes.number, me: React.PropTypes.number,
boostModal: React.PropTypes.bool,
muted: React.PropTypes.bool muted: React.PropTypes.bool
}, },

View File

@ -46,8 +46,8 @@ const StatusActionBar = React.createClass({
this.props.onFavourite(this.props.status); this.props.onFavourite(this.props.status);
}, },
handleReblogClick () { handleReblogClick (e) {
this.props.onReblog(this.props.status); this.props.onReblog(this.props.status, e);
}, },
handleDeleteClick () { handleDeleteClick () {

View File

@ -26,7 +26,8 @@ const makeMapStateToProps = () => {
const mapStateToProps = (state, props) => ({ const mapStateToProps = (state, props) => ({
status: getStatus(state, props.id), status: getStatus(state, props.id),
me: state.getIn(['meta', 'me']) me: state.getIn(['meta', 'me']),
boostModal: state.getIn(['meta', 'boost_modal'])
}); });
return mapStateToProps; return mapStateToProps;
@ -38,11 +39,19 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(replyCompose(status, router)); dispatch(replyCompose(status, router));
}, },
onReblog (status) { onModalReblog (status) {
dispatch(reblog(status));
},
onReblog (status, e) {
if (status.get('reblogged')) { if (status.get('reblogged')) {
dispatch(unreblog(status)); dispatch(unreblog(status));
} else { } else {
dispatch(reblog(status)); if (e.altKey || !this.boostModal) {
this.onModalReblog(status);
} else {
dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
}
} }
}, },

View File

@ -37,8 +37,8 @@ const ActionBar = React.createClass({
this.props.onReply(this.props.status); this.props.onReply(this.props.status);
}, },
handleReblogClick () { handleReblogClick (e) {
this.props.onReblog(this.props.status); this.props.onReblog(this.props.status, e);
}, },
handleFavouriteClick () { handleFavouriteClick () {

View File

@ -38,7 +38,8 @@ const makeMapStateToProps = () => {
status: getStatus(state, Number(props.params.statusId)), status: getStatus(state, Number(props.params.statusId)),
ancestorsIds: state.getIn(['timelines', 'ancestors', Number(props.params.statusId)]), ancestorsIds: state.getIn(['timelines', 'ancestors', Number(props.params.statusId)]),
descendantsIds: state.getIn(['timelines', 'descendants', Number(props.params.statusId)]), descendantsIds: state.getIn(['timelines', 'descendants', Number(props.params.statusId)]),
me: state.getIn(['meta', 'me']) me: state.getIn(['meta', 'me']),
boostModal: state.getIn(['meta', 'boost_modal'])
}); });
return mapStateToProps; return mapStateToProps;
@ -55,7 +56,8 @@ const Status = React.createClass({
status: ImmutablePropTypes.map, status: ImmutablePropTypes.map,
ancestorsIds: ImmutablePropTypes.list, ancestorsIds: ImmutablePropTypes.list,
descendantsIds: ImmutablePropTypes.list, descendantsIds: ImmutablePropTypes.list,
me: React.PropTypes.number me: React.PropTypes.number,
boostModal: React.PropTypes.bool
}, },
mixins: [PureRenderMixin], mixins: [PureRenderMixin],
@ -82,11 +84,19 @@ const Status = React.createClass({
this.props.dispatch(replyCompose(status, this.context.router)); this.props.dispatch(replyCompose(status, this.context.router));
}, },
handleReblogClick (status) { handleModalReblog (status) {
this.props.dispatch(reblog(status));
},
handleReblogClick (status, e) {
if (status.get('reblogged')) { if (status.get('reblogged')) {
this.props.dispatch(unreblog(status)); this.props.dispatch(unreblog(status));
} else { } else {
this.props.dispatch(reblog(status)); if (e.altKey || !this.props.boostModal) {
this.handleModalReblog(status);
} else {
this.props.dispatch(openModal('BOOST', { status, onReblog: this.handleModalReblog }));
}
} }
}, },

View File

@ -0,0 +1,64 @@
import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { defineMessages, injectIntl } from 'react-intl';
import IconButton from '../../../components/icon_button';
import Button from '../../../components/button';
import DetailedStatus from '../../status/components/detailed_status';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
reblog: { id: 'status.reblog', defaultMessage: 'Boost' }
});
const closeStyle = {
position: 'absolute',
top: '4px',
right: '4px'
};
const buttonContainerStyle = {
textAlign: 'right',
padding: '10px'
};
const BoostModal = React.createClass({
propTypes: {
status: ImmutablePropTypes.map.isRequired,
onReblog: React.PropTypes.func.isRequired,
onClose: React.PropTypes.func.isRequired,
intl: React.PropTypes.object.isRequired
},
mixins: [PureRenderMixin],
handleReblog() {
this.props.onReblog(this.props.status);
this.props.onClose();
},
handleOpenMedia() {
// do nothing"
},
render () {
const { status, intl, onClose } = this.props;
const reblogButton = <span><i className='fa fa-retweet' /> {intl.formatMessage(messages.reblog)}</span>;
return (
<div className='modal-root__modal boost-modal'>
<IconButton title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} style={closeStyle} />
<div>
<DetailedStatus status={status} onOpenMedia={this.handleOpenMedia} />
</div>
<div style={buttonContainerStyle}>
<Button text={reblogButton} onClick={this.handleReblog} />
</div>
</div>
);
}
});
export default injectIntl(BoostModal);

View File

@ -1,9 +1,11 @@
import PureRenderMixin from 'react-addons-pure-render-mixin'; import PureRenderMixin from 'react-addons-pure-render-mixin';
import MediaModal from './media_modal'; import MediaModal from './media_modal';
import BoostModal from './boost_modal';
import { TransitionMotion, spring } from 'react-motion'; import { TransitionMotion, spring } from 'react-motion';
const MODAL_COMPONENTS = { const MODAL_COMPONENTS = {
'MEDIA': MediaModal 'MEDIA': MediaModal,
'BOOST': BoostModal
}; };
const ModalRoot = React.createClass({ const ModalRoot = React.createClass({

File diff suppressed because one or more lines are too long

View File

@ -1215,7 +1215,7 @@ a.status__content__spoiler-link {
@import 'boost'; @import 'boost';
button i.fa-retweet { button.icon-button i.fa-retweet {
height: 19px; height: 19px;
width: 22px; width: 22px;
background-position: 0 0; background-position: 0 0;
@ -1227,7 +1227,7 @@ button i.fa-retweet {
} }
} }
button.active i.fa-retweet { button.icon-button.active i.fa-retweet {
transition-duration: 0.9s; transition-duration: 0.9s;
background-position: 0 100%; background-position: 0 100%;
} }
@ -1936,3 +1936,32 @@ button.active i.fa-retweet {
max-height: 80vh; max-height: 80vh;
} }
} }
.boost-modal {
display: block;
color: white;
background: lighten($color1, 13%);
max-width: 90vw;
width: 480px;
padding-top: 25px;
border-radius: 3px;
position: relative;
& .detailed-status {
pointer-events: none;
max-height: 60vh;
overflow-y: auto;
}
& > .icon-button {
color: lighten($color1, 40%);
&:hover, &:active {
color: lighten($color1, 60%);
}
}
}

View File

@ -23,8 +23,9 @@ class Settings::PreferencesController < ApplicationController
} }
current_user.settings['default_privacy'] = user_params[:setting_default_privacy] current_user.settings['default_privacy'] = user_params[:setting_default_privacy]
current_user.settings['boost_modal'] = user_params[:setting_boost_modal] == '1'
if current_user.update(user_params.except(:notification_emails, :interactions, :setting_default_privacy)) if current_user.update(user_params.except(:notification_emails, :interactions, :setting_default_privacy, :setting_boost_modal))
redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg') redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
else else
render action: :show render action: :show
@ -34,6 +35,6 @@ class Settings::PreferencesController < ApplicationController
private private
def user_params def user_params
params.require(:user).permit(:locale, :setting_default_privacy, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention, :digest], interactions: [:must_be_follower, :must_be_following]) params.require(:user).permit(:locale, :setting_default_privacy, :setting_boost_modal, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention, :digest], interactions: [:must_be_follower, :must_be_following])
end end
end end

View File

@ -26,4 +26,8 @@ class User < ApplicationRecord
def setting_default_privacy def setting_default_privacy
settings.default_privacy || (account.locked? ? 'private' : 'public') settings.default_privacy || (account.locked? ? 'private' : 'public')
end end
def setting_boost_modal
settings.boost_modal
end
end end

View File

@ -5,6 +5,7 @@ node(:meta) do
access_token: @token, access_token: @token,
locale: I18n.locale, locale: I18n.locale,
me: current_account.id, me: current_account.id,
boost_modal: current_account.user.setting_boost_modal,
} }
end end

View File

@ -22,5 +22,8 @@
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label = ff.input :must_be_follower, as: :boolean, wrapper: :with_label
= ff.input :must_be_following, as: :boolean, wrapper: :with_label = ff.input :must_be_following, as: :boolean, wrapper: :with_label
.fields-group
= f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit

View File

@ -29,6 +29,7 @@ en:
setting_default_privacy: Post privacy setting_default_privacy: Post privacy
type: Import type type: Import type
username: Username username: Username
setting_boost_modal: Show confirmation dialog before boosting
interactions: interactions:
must_be_follower: Block notifications from non-followers must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow must_be_following: Block notifications from people you don't follow

View File

@ -14,6 +14,7 @@ defaults: &defaults
site_contact_email: '' site_contact_email: ''
open_registrations: true open_registrations: true
closed_registrations_message: '' closed_registrations_message: ''
boost_modal: true
notification_emails: notification_emails:
follow: false follow: false
reblog: false reblog: false