Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
mastofe
Commits
47125c90
Verified
Commit
47125c90
authored
Mar 03, 2019
by
Haelwenn
Browse files
Remove unsupported Delete&Redraft
parent
3554d8fc
Changes
3
Show whitespace changes
Inline
Side-by-side
app/javascript/flavours/glitch/components/status_action_bar.js
View file @
47125c90
...
...
@@ -231,7 +231,6 @@ class StatusActionBar extends ImmutablePureComponent {
}
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
delete
),
action
:
this
.
handleDeleteClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
redraft
),
action
:
this
.
handleRedraftClick
});
}
else
{
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
mention
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleMentionClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
direct
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleDirectClick
});
...
...
app/javascript/flavours/glitch/features/status/components/action_bar.js
View file @
47125c90
...
...
@@ -163,7 +163,6 @@ class ActionBar extends React.PureComponent {
menu
.
push
({
text
:
intl
.
formatMessage
(
mutingConversation
?
messages
.
unmuteConversation
:
messages
.
muteConversation
),
action
:
this
.
handleConversationMuteClick
});
menu
.
push
(
null
);
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
delete
),
action
:
this
.
handleDeleteClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
redraft
),
action
:
this
.
handleRedraftClick
});
}
else
{
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
mention
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleMentionClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
direct
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleDirectClick
});
...
...
app/javascript/mastodon/components/status_action_bar.js
View file @
47125c90
...
...
@@ -266,7 +266,6 @@ class StatusActionBar extends ImmutablePureComponent {
}
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
delete
),
action
:
this
.
handleDeleteClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
redraft
),
action
:
this
.
handleRedraftClick
});
}
else
{
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
mention
,
{
name
:
account
.
get
(
'
username
'
)
}),
action
:
this
.
handleMentionClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
direct
,
{
name
:
account
.
get
(
'
username
'
)
}),
action
:
this
.
handleDirectClick
});
...
...
Write
Preview
Supports
Markdown
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