summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-08-21 20:06:34 +0800
committerJoram Wilander <jwawilander@gmail.com>2017-08-21 08:06:34 -0400
commit22efdbe6fb897ea1b4b2cf52c66eb3037474fcf5 (patch)
tree5c669e3e9b132a083bd4c9ea513f1a18fb7ce041 /webapp
parentd7b055f4284dea3b776fe20af436a9da3a48c6b8 (diff)
downloadchat-22efdbe6fb897ea1b4b2cf52c66eb3037474fcf5.tar.gz
chat-22efdbe6fb897ea1b4b2cf52c66eb3037474fcf5.tar.bz2
chat-22efdbe6fb897ea1b4b2cf52c66eb3037474fcf5.zip
fix expand/collapse arrows for youtube videos (#7240)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/post_view/post_attachment_opengraph/post_attachment_opengraph.jsx2
-rw-r--r--webapp/components/post_view/post_body_additional_content.jsx1
-rw-r--r--webapp/components/youtube_video/youtube_video.jsx4
3 files changed, 5 insertions, 2 deletions
diff --git a/webapp/components/post_view/post_attachment_opengraph/post_attachment_opengraph.jsx b/webapp/components/post_view/post_attachment_opengraph/post_attachment_opengraph.jsx
index 04738fdcc..729084637 100644
--- a/webapp/components/post_view/post_attachment_opengraph/post_attachment_opengraph.jsx
+++ b/webapp/components/post_view/post_attachment_opengraph/post_attachment_opengraph.jsx
@@ -107,7 +107,7 @@ export default class PostAttachmentOpenGraph extends React.PureComponent {
}
componentDidUpdate() {
- postListScrollChange();
+ setTimeout(postListScrollChange, 0);
}
fetchData(url) {
diff --git a/webapp/components/post_view/post_body_additional_content.jsx b/webapp/components/post_view/post_body_additional_content.jsx
index bf01374fe..9310d951e 100644
--- a/webapp/components/post_view/post_body_additional_content.jsx
+++ b/webapp/components/post_view/post_body_additional_content.jsx
@@ -134,6 +134,7 @@ export default class PostBodyAdditionalContent extends React.PureComponent {
channelId={this.props.post.channel_id}
link={link}
show={this.state.embedVisible}
+ onLinkLoaded={this.handleLinkLoaded}
/>
);
}
diff --git a/webapp/components/youtube_video/youtube_video.jsx b/webapp/components/youtube_video/youtube_video.jsx
index 34a0ed14c..c2bfa317c 100644
--- a/webapp/components/youtube_video/youtube_video.jsx
+++ b/webapp/components/youtube_video/youtube_video.jsx
@@ -14,7 +14,8 @@ export default class YoutubeVideo extends React.PureComponent {
channelId: PropTypes.string.isRequired,
currentChannelId: PropTypes.string.isRequired,
link: PropTypes.string.isRequired,
- show: PropTypes.bool.isRequired
+ show: PropTypes.bool.isRequired,
+ onLinkLoaded: PropTypes.func
}
constructor(props) {
@@ -103,6 +104,7 @@ export default class YoutubeVideo extends React.PureComponent {
} else {
this.loadWithoutKey();
}
+ this.props.onLinkLoaded();
}
loadWithoutKey() {