Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
9349f106
Commit
9349f106
authored
5 years ago
by
ThibG
Committed by
Eugen Rochko
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix animate on hover in poll options without CW (#11404)
parent
6a1f08d2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/javascript/mastodon/components/status_content.js
+13
-36
13 additions, 36 deletions
app/javascript/mastodon/components/status_content.js
with
13 additions
and
36 deletions
app/javascript/mastodon/components/status_content.js
+
13
−
36
View file @
9349f106
...
...
@@ -234,46 +234,23 @@ export default class StatusContent extends React.PureComponent {
<
/div
>
);
}
else
if
(
this
.
props
.
onClick
)
{
const
output
=
[
<
div
ref
=
{
this
.
setRef
}
tabIndex
=
'
0
'
key
=
'
content
'
className
=
{
classNames
}
style
=
{
directionStyle
}
dangerouslySetInnerHTML
=
{
content
}
lang
=
{
status
.
get
(
'
language
'
)}
onMouseDown
=
{
this
.
handleMouseDown
}
onMouseUp
=
{
this
.
handleMouseUp
}
/>
,
];
if
(
this
.
state
.
collapsed
)
{
output
.
push
(
readMoreButton
);
}
return
(
<
div
className
=
{
classNames
}
ref
=
{
this
.
setRef
}
tabIndex
=
'
0
'
style
=
{
directionStyle
}
onMouseDown
=
{
this
.
handleMouseDown
}
onMouseUp
=
{
this
.
handleMouseUp
}
>
<
div
className
=
'
status__content__text status__content__text--visible
'
style
=
{
directionStyle
}
dangerouslySetInnerHTML
=
{
content
}
lang
=
{
status
.
get
(
'
language
'
)}
/
>
if
(
status
.
get
(
'
poll
'
))
{
output
.
push
(
<
PollContainer
pollId
=
{
status
.
get
(
'
poll
'
)}
/>
)
;
}
{
!!
this
.
state
.
collapsed
&&
readMoreButton
}
return
output
;
{
!!
status
.
get
(
'
poll
'
)
&&
<
PollContainer
pollId
=
{
status
.
get
(
'
poll
'
)}
/>
}
<
/div
>
);
}
else
{
const
output
=
[
<
div
tabIndex
=
'
0
'
ref
=
{
this
.
setRef
}
className
=
'
status__content
'
style
=
{
directionStyle
}
dangerouslySetInnerHTML
=
{
content
}
lang
=
{
status
.
get
(
'
language
'
)}
/>
,
];
if
(
status
.
get
(
'
poll
'
))
{
output
.
push
(
<
PollContainer
pollId
=
{
status
.
get
(
'
poll
'
)}
/>
)
;
}
return
(
<
div
className
=
{
classNames
}
ref
=
{
this
.
setRef
}
tabIndex
=
'
0
'
style
=
{
directionStyle
}
>
<
div
className
=
'
status__content__text status__content__text--visible
'
style
=
{
directionStyle
}
dangerouslySetInnerHTML
=
{
content
}
lang
=
{
status
.
get
(
'
language
'
)}
/
>
return
output
;
{
!!
status
.
get
(
'
poll
'
)
&&
<
PollContainer
pollId
=
{
status
.
get
(
'
poll
'
)}
/>
}
<
/div
>
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment