Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
La Quadrature du Net
mamot
Commits
0dd71af5
Commit
0dd71af5
authored
Apr 27, 2017
by
Kaylee
Committed by
Eugen Rochko
Apr 27, 2017
Browse files
Copy over "Boost" hover text fix to detailed view. (#2508)
from #1754, should close out #1394
parent
0618f099
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/components/features/status/components/action_bar.jsx
View file @
0dd71af5
...
...
@@ -9,6 +9,7 @@ const messages = defineMessages({
mention
:
{
id
:
'
status.mention
'
,
defaultMessage
:
'
Mention @{name}
'
},
reply
:
{
id
:
'
status.reply
'
,
defaultMessage
:
'
Reply
'
},
reblog
:
{
id
:
'
status.reblog
'
,
defaultMessage
:
'
Reblog
'
},
cannot_reblog
:
{
id
:
'
status.cannot_reblog
'
,
defaultMessage
:
'
This post cannot be reblogged
'
},
favourite
:
{
id
:
'
status.favourite
'
,
defaultMessage
:
'
Favourite
'
},
report
:
{
id
:
'
status.report
'
,
defaultMessage
:
'
Report @{name}
'
}
});
...
...
@@ -67,10 +68,12 @@ class ActionBar extends React.PureComponent {
if
(
status
.
get
(
'
visibility
'
)
===
'
direct
'
)
reblogIcon
=
'
envelope
'
;
else
if
(
status
.
get
(
'
visibility
'
)
===
'
private
'
)
reblogIcon
=
'
lock
'
;
let
reblog_disabled
=
(
status
.
get
(
'
visibility
'
)
===
'
direct
'
||
status
.
get
(
'
visibility
'
)
===
'
private
'
);
return
(
<
div
className
=
'detailed-status__action-bar'
>
<
div
className
=
'detailed-status__button'
><
IconButton
title
=
{
intl
.
formatMessage
(
messages
.
reply
)
}
icon
=
{
status
.
get
(
'
in_reply_to_id
'
,
null
)
===
null
?
'
reply
'
:
'
reply-all
'
}
onClick
=
{
this
.
handleReplyClick
}
/></
div
>
<
div
className
=
'detailed-status__button'
><
IconButton
disabled
=
{
status
.
get
(
'
visibility
'
)
===
'
direct
'
||
status
.
get
(
'
visibility
'
)
===
'
private
'
}
active
=
{
status
.
get
(
'
reblogged
'
)
}
title
=
{
intl
.
formatMessage
(
messages
.
reblog
)
}
icon
=
{
reblogIcon
}
onClick
=
{
this
.
handleReblogClick
}
/></
div
>
<
div
className
=
'detailed-status__button'
><
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
=
'detailed-status__button'
><
IconButton
animate
=
{
true
}
active
=
{
status
.
get
(
'
favourited
'
)
}
title
=
{
intl
.
formatMessage
(
messages
.
favourite
)
}
icon
=
'star'
onClick
=
{
this
.
handleFavouriteClick
}
activeStyle
=
{
{
color
:
'
#ca8f04
'
}
}
/></
div
>
<
div
className
=
'detailed-status__button'
><
DropdownMenu
size
=
{
18
}
icon
=
'ellipsis-h'
items
=
{
menu
}
direction
=
"left"
/></
div
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment