diff options
| -rw-r--r-- | web/react/components/file_attachment.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/file_attachment_list.jsx | 9 | ||||
| -rw-r--r-- | web/react/components/post_body.jsx | 6 | ||||
| -rw-r--r-- | web/react/components/post_right.jsx | 12 |
4 files changed, 15 insertions, 16 deletions
diff --git a/web/react/components/file_attachment.jsx b/web/react/components/file_attachment.jsx index 4a81dd8f3..87922a615 100644 --- a/web/react/components/file_attachment.jsx +++ b/web/react/components/file_attachment.jsx @@ -8,7 +8,7 @@ module.exports = React.createClass({ propTypes: { filenames: React.PropTypes.arrayOf(React.PropTypes.string).isRequired, index: React.PropTypes.number.isRequired, - imageModalId: React.PropTypes.string.isRequired, + modalId: React.PropTypes.string.isRequired, handleImageClick: React.PropTypes.func }, componentDidMount: function() { @@ -66,7 +66,7 @@ module.exports = React.createClass({ if (type === "image") { thumbnail = ( <a className="post-image__thumbnail" href="#" onClick={this.props.handleImageClick} - data-img-id={this.props.index} data-toggle="modal" data-target={"#" + this.props.imageModalId }> + data-img-id={this.props.index} data-toggle="modal" data-target={"#" + this.props.modalId }> <div ref={filename} className="post__load" style={{backgroundImage: 'url(/static/images/load.gif)'}}/> </a> ); diff --git a/web/react/components/file_attachment_list.jsx b/web/react/components/file_attachment_list.jsx index 0b52d6a70..3da1e1482 100644 --- a/web/react/components/file_attachment_list.jsx +++ b/web/react/components/file_attachment_list.jsx @@ -9,7 +9,7 @@ module.exports = React.createClass({ displayName: "FileAttachmentList", propTypes: { filenames: React.PropTypes.arrayOf(React.PropTypes.string).isRequired, - postId: React.PropTypes.string.isRequired, + modalId: React.PropTypes.string.isRequired, channelId: React.PropTypes.string, userId: React.PropTypes.string }, @@ -18,12 +18,11 @@ module.exports = React.createClass({ }, render: function() { var filenames = this.props.filenames; - - var postImageModalId = "view_image_modal_" + this.props.postId; + var modalId = this.props.modalId; var postFiles = []; for (var i = 0; i < filenames.length && i < Constants.MAX_DISPLAY_FILES; i++) { - postFiles.push(<FileAttachment key={i} filenames={filenames} index={i} imageModalId={postImageModalId} handleImageClick={this.handleImageClick} />); + postFiles.push(<FileAttachment key={i} filenames={filenames} index={i} modalId={modalId} handleImageClick={this.handleImageClick} />); } return ( @@ -34,7 +33,7 @@ module.exports = React.createClass({ <ViewImageModal channelId={this.props.channelId} userId={this.props.userId} - modalId={postImageModalId} + modalId={modalId} startId={this.state.startImgId} imgCount={0} filenames={filenames} /> diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index d29784db9..860c96d84 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -70,10 +70,10 @@ module.exports = React.createClass({ <p key={post.id+"_message"} className={postClass}><span>{inner}</span></p> { filenames && filenames.length > 0 ? <FileAttachmentList - postId={post.id} + filenames={filenames} + modalId={"view_image_modal_" + post.id} channelId={post.channel_id} - userId={post.user_id} - filenames={filenames} /> + userId={post.user_id} /> : "" } { embed } </div> diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 1d09842f3..ad8b54012 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -104,10 +104,10 @@ RootPost = React.createClass({ <p>{message}</p> { post.filenames && post.filenames.length > 0 ? <FileAttachmentList - postId={post.id} + filenames={post.filenames} + modalId={"rhs_view_image_modal_" + post.id} channelId={post.channel_id} - userId={post.user_id} - filenames={post.filenames} /> + userId={post.user_id} /> : "" } </div> </div> @@ -163,10 +163,10 @@ CommentPost = React.createClass({ <p>{message}</p> { post.filenames && post.filenames.length > 0 ? <FileAttachmentList - postId={post.id} + filenames={post.filenames} + modalId={"rhs_comment_view_image_modal_" + post.id} channelId={post.channel_id} - userId={post.user_id} - filenames={post.filenames} /> + userId={post.user_id} /> : "" } </div> </div> |