From 441a9540cae44e8275a3783cb9a1c6471577a646 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson <matthew@matrix.org> Date: Sun, 3 Jan 2016 00:11:11 +0000 Subject: [PATCH] sync CSS classnames with current react component names --- src/HtmlUtils.js | 2 +- src/components/views/messages/MFileBody.js | 6 +++--- src/components/views/messages/MImageBody.js | 10 +++++----- src/components/views/messages/MVideoBody.js | 4 ++-- src/components/views/messages/TextualBody.js | 6 +++--- src/components/views/messages/TextualEvent.js | 2 +- src/components/views/messages/UnknownBody.js | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index e194f4a3bd..95c6a46458 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -150,7 +150,7 @@ module.exports = { var body; if (highlights && highlights.length > 0) { - var highlighter = new Highlighter(isHtml, "mx_MessageTile_searchHighlight", opts.onHighlightClick); + var highlighter = new Highlighter(isHtml, "mx_EventTile_searchHighlight", opts.onHighlightClick); body = highlighter.applyHighlights(safeBody, highlights); } else { diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js index be7f2f0593..193cafe255 100644 --- a/src/components/views/messages/MFileBody.js +++ b/src/components/views/messages/MFileBody.js @@ -54,8 +54,8 @@ module.exports = React.createClass({ if (httpUrl) { return ( - <span className="mx_MFileTile"> - <div className="mx_MImageTile_download"> + <span className="mx_MFileBody"> + <div className="mx_MImageBody_download"> <a href={cli.mxcUrlToHttp(content.url)} target="_blank"> <img src="img/download.png" width="10" height="12"/> Download {text} @@ -65,7 +65,7 @@ module.exports = React.createClass({ ); } else { var extra = text ? ': '+text : ''; - return <span className="mx_MFileTile"> + return <span className="mx_MFileBody"> Invalid file{extra} </span> } diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 02ac50ca15..6afdddc307 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -109,14 +109,14 @@ module.exports = React.createClass({ var thumbUrl = this._getThumbUrl(); if (thumbUrl) { return ( - <span className="mx_MImageTile"> + <span className="mx_MImageBody"> <a href={cli.mxcUrlToHttp(content.url)} onClick={ this.onClick }> - <img className="mx_MImageTile_thumbnail" src={thumbUrl} + <img className="mx_MImageBody_thumbnail" src={thumbUrl} alt={content.body} style={imgStyle} onMouseEnter={this.onImageEnter} onMouseLeave={this.onImageLeave} /> </a> - <div className="mx_MImageTile_download"> + <div className="mx_MImageBody_download"> <a href={cli.mxcUrlToHttp(content.url)} target="_blank"> <img src="img/download.png" width="10" height="12"/> Download {content.body} ({ content.info && content.info.size ? filesize(content.info.size) : "Unknown size" }) @@ -126,13 +126,13 @@ module.exports = React.createClass({ ); } else if (content.body) { return ( - <span className="mx_MImageTile"> + <span className="mx_MImageBody"> Image '{content.body}' cannot be displayed. </span> ); } else { return ( - <span className="mx_MImageTile"> + <span className="mx_MImageBody"> This image cannot be displayed. </span> ); diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js index 0d022f1648..ddd3dceca7 100644 --- a/src/components/views/messages/MVideoBody.js +++ b/src/components/views/messages/MVideoBody.js @@ -70,8 +70,8 @@ module.exports = React.createClass({ } return ( - <span className="mx_MVideoTile"> - <video className="mx_MVideoTile" src={cli.mxcUrlToHttp(content.url)} alt={content.body} + <span className="mx_MVideoBody"> + <video className="mx_MVideoBody" src={cli.mxcUrlToHttp(content.url)} alt={content.body} controls preload={preload} autoPlay="0" height={height} width={width} poster={poster}> </video> diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index 7134d5faf4..7dd7a46842 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -55,19 +55,19 @@ module.exports = React.createClass({ case "m.emote": var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender(); return ( - <span ref="content" className="mx_MEmoteTile mx_MessageTile_content"> + <span ref="content" className="mx_MEmoteBody mx_EventTile_content"> * { name } { body } </span> ); case "m.notice": return ( - <span ref="content" className="mx_MNoticeTile mx_MessageTile_content"> + <span ref="content" className="mx_MNoticeBody mx_EventTile_content"> { body } </span> ); default: // including "m.text" return ( - <span ref="content" className="mx_MTextTile mx_MessageTile_content"> + <span ref="content" className="mx_MTextBody mx_EventTile_content"> { body } </span> ); diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js index 5a9a1408c5..a2db21cfae 100644 --- a/src/components/views/messages/TextualEvent.js +++ b/src/components/views/messages/TextualEvent.js @@ -34,7 +34,7 @@ module.exports = React.createClass({ if (text == null || text.length == 0) return null; return ( - <div className="mx_EventAsTextTile"> + <div className="mx_TextualEvent"> {TextForEvent.textForEvent(this.props.mxEvent)} </div> ); diff --git a/src/components/views/messages/UnknownBody.js b/src/components/views/messages/UnknownBody.js index ae49af198d..f831e08a2c 100644 --- a/src/components/views/messages/UnknownBody.js +++ b/src/components/views/messages/UnknownBody.js @@ -24,7 +24,7 @@ module.exports = React.createClass({ render: function() { var content = this.props.mxEvent.getContent(); return ( - <span className="mx_UnknownMessageTile"> + <span className="mx_UnknownBody"> {content.body} </span> ); -- GitLab