Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tooltip for boosting depends on toot visibility (#1394) #1754

Merged
merged 7 commits into from Apr 23, 2017
Merged

Tooltip for boosting depends on toot visibility (#1394) #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
159ab9b
Made tooltip for boosting depend on visibility
Apr 14, 2017
2366827
Merge branch 'master' into change-boost-tooltips
Apr 23, 2017
baa5c03
Removed spaces that were added in merge conflict resolution
Apr 23, 2017
9c0f53a
Try again :P
Apr 23, 2017
744eafe
Added missing bracket
Apr 23, 2017
1ed65fa
Changed 'toot' to 'status'
Apr 23, 2017
e75a698
Merge branch 'master' into change-boost-tooltips
Apr 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/assets/javascripts/components/components/status_action_bar.jsx
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ const messages = defineMessages({
reply: { id: 'status.reply', defaultMessage: 'Reply' },
replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
reblog: { id: 'status.reblog', defaultMessage: 'Reblog' },
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be reblogged' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
open: { id: 'status.open', defaultMessage: 'Expand this status' },
report: { id: 'status.report', defaultMessage: 'Report @{name}' }
Expand Down Expand Up @@ -71,6 +72,7 @@ class StatusActionBar extends React.PureComponent {

render () {
const { status, me, intl } = this.props;
const reblog_disabled = status.get('visibility') === 'private' || status.get('visibility') === 'direct';
let menu = [];

menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
Expand Down Expand Up @@ -102,7 +104,7 @@ class StatusActionBar extends React.PureComponent {
return (
<div className='status__action-bar'>
<div className='status__action-bar-button-wrapper'><IconButton title={reply_title} icon={reply_icon} onClick={this.handleReplyClick} /></div>
<div className='status__action-bar-button-wrapper'><IconButton disabled={status.get('visibility') === 'private' || status.get('visibility') === 'direct'} active={status.get('reblogged')} title={intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
<div className='status__action-bar-button-wrapper'><IconButton disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
<div className='status__action-bar-button-wrapper'><IconButton animate={true} active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} className='star-icon' /></div>

<div className='status__action-bar-dropdown'>
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/components/locales/en.jsx
View file
Open in desktop
Expand Up @@ -119,6 +119,7 @@ const en = {
"status.mention": "Mention @{name}",
"status.open": "Expand this status",
"status.reblog": "Boost",
"status.cannot_reblog": "This status cannot be boosted",
"status.reblogged_by": "{name} boosted",
"status.reply": "Reply",
"status.replyAll": "Reply to thread",
Expand Down