You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-03 00:33:22 +03:00 
			
		
		
		
	Merge pull request #75 from matrix-org/matthew/css-refactor
sync CSS classnames with current react component names
This commit is contained in:
		@@ -150,7 +150,7 @@ module.exports = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        var body;
 | 
					        var body;
 | 
				
			||||||
        if (highlights && highlights.length > 0) {
 | 
					        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);
 | 
					            body = highlighter.applyHighlights(safeBody, highlights);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        else {
 | 
					        else {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,8 +54,8 @@ module.exports = React.createClass({
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        if (httpUrl) {
 | 
					        if (httpUrl) {
 | 
				
			||||||
            return (
 | 
					            return (
 | 
				
			||||||
                <span className="mx_MFileTile">
 | 
					                <span className="mx_MFileBody">
 | 
				
			||||||
                    <div className="mx_MImageTile_download">
 | 
					                    <div className="mx_MImageBody_download">
 | 
				
			||||||
                        <a href={cli.mxcUrlToHttp(content.url)} target="_blank">
 | 
					                        <a href={cli.mxcUrlToHttp(content.url)} target="_blank">
 | 
				
			||||||
                            <img src="img/download.png" width="10" height="12"/>
 | 
					                            <img src="img/download.png" width="10" height="12"/>
 | 
				
			||||||
                            Download {text}
 | 
					                            Download {text}
 | 
				
			||||||
@@ -65,7 +65,7 @@ module.exports = React.createClass({
 | 
				
			|||||||
            );
 | 
					            );
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            var extra = text ? ': '+text : '';
 | 
					            var extra = text ? ': '+text : '';
 | 
				
			||||||
            return <span className="mx_MFileTile">
 | 
					            return <span className="mx_MFileBody">
 | 
				
			||||||
                Invalid file{extra}
 | 
					                Invalid file{extra}
 | 
				
			||||||
            </span>
 | 
					            </span>
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -109,14 +109,14 @@ module.exports = React.createClass({
 | 
				
			|||||||
        var thumbUrl = this._getThumbUrl();
 | 
					        var thumbUrl = this._getThumbUrl();
 | 
				
			||||||
        if (thumbUrl) {
 | 
					        if (thumbUrl) {
 | 
				
			||||||
            return (
 | 
					            return (
 | 
				
			||||||
                <span className="mx_MImageTile">
 | 
					                <span className="mx_MImageBody">
 | 
				
			||||||
                    <a href={cli.mxcUrlToHttp(content.url)} onClick={ this.onClick }>
 | 
					                    <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}
 | 
					                            alt={content.body} style={imgStyle}
 | 
				
			||||||
                            onMouseEnter={this.onImageEnter}
 | 
					                            onMouseEnter={this.onImageEnter}
 | 
				
			||||||
                            onMouseLeave={this.onImageLeave} />
 | 
					                            onMouseLeave={this.onImageLeave} />
 | 
				
			||||||
                    </a>
 | 
					                    </a>
 | 
				
			||||||
                    <div className="mx_MImageTile_download">
 | 
					                    <div className="mx_MImageBody_download">
 | 
				
			||||||
                        <a href={cli.mxcUrlToHttp(content.url)} target="_blank">
 | 
					                        <a href={cli.mxcUrlToHttp(content.url)} target="_blank">
 | 
				
			||||||
                            <img src="img/download.png" width="10" height="12"/>
 | 
					                            <img src="img/download.png" width="10" height="12"/>
 | 
				
			||||||
                            Download {content.body} ({ content.info && content.info.size ? filesize(content.info.size) : "Unknown size" })
 | 
					                            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) {
 | 
					        } else if (content.body) {
 | 
				
			||||||
            return (
 | 
					            return (
 | 
				
			||||||
                <span className="mx_MImageTile">
 | 
					                <span className="mx_MImageBody">
 | 
				
			||||||
                    Image '{content.body}' cannot be displayed.
 | 
					                    Image '{content.body}' cannot be displayed.
 | 
				
			||||||
                </span>
 | 
					                </span>
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            return (
 | 
					            return (
 | 
				
			||||||
                <span className="mx_MImageTile">
 | 
					                <span className="mx_MImageBody">
 | 
				
			||||||
                    This image cannot be displayed.
 | 
					                    This image cannot be displayed.
 | 
				
			||||||
                </span>
 | 
					                </span>
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -70,8 +70,8 @@ module.exports = React.createClass({
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return (
 | 
					        return (
 | 
				
			||||||
            <span className="mx_MVideoTile">
 | 
					            <span className="mx_MVideoBody">
 | 
				
			||||||
                <video className="mx_MVideoTile" src={cli.mxcUrlToHttp(content.url)} alt={content.body}
 | 
					                <video className="mx_MVideoBody" src={cli.mxcUrlToHttp(content.url)} alt={content.body}
 | 
				
			||||||
                    controls preload={preload} autoPlay="0"
 | 
					                    controls preload={preload} autoPlay="0"
 | 
				
			||||||
                    height={height} width={width} poster={poster}>
 | 
					                    height={height} width={width} poster={poster}>
 | 
				
			||||||
                </video>
 | 
					                </video>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,19 +55,19 @@ module.exports = React.createClass({
 | 
				
			|||||||
            case "m.emote":
 | 
					            case "m.emote":
 | 
				
			||||||
                var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
 | 
					                var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
 | 
				
			||||||
                return (
 | 
					                return (
 | 
				
			||||||
                    <span ref="content" className="mx_MEmoteTile mx_MessageTile_content">
 | 
					                    <span ref="content" className="mx_MEmoteBody mx_EventTile_content">
 | 
				
			||||||
                        * { name } { body }
 | 
					                        * { name } { body }
 | 
				
			||||||
                    </span>
 | 
					                    </span>
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
            case "m.notice":
 | 
					            case "m.notice":
 | 
				
			||||||
                return (
 | 
					                return (
 | 
				
			||||||
                    <span ref="content" className="mx_MNoticeTile mx_MessageTile_content">
 | 
					                    <span ref="content" className="mx_MNoticeBody mx_EventTile_content">
 | 
				
			||||||
                        { body }
 | 
					                        { body }
 | 
				
			||||||
                    </span>
 | 
					                    </span>
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
            default: // including "m.text"
 | 
					            default: // including "m.text"
 | 
				
			||||||
                return (
 | 
					                return (
 | 
				
			||||||
                    <span ref="content" className="mx_MTextTile mx_MessageTile_content">
 | 
					                    <span ref="content" className="mx_MTextBody mx_EventTile_content">
 | 
				
			||||||
                        { body }
 | 
					                        { body }
 | 
				
			||||||
                    </span>
 | 
					                    </span>
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ module.exports = React.createClass({
 | 
				
			|||||||
        if (text == null || text.length == 0) return null;
 | 
					        if (text == null || text.length == 0) return null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return (
 | 
					        return (
 | 
				
			||||||
            <div className="mx_EventAsTextTile">
 | 
					            <div className="mx_TextualEvent">
 | 
				
			||||||
                {TextForEvent.textForEvent(this.props.mxEvent)}
 | 
					                {TextForEvent.textForEvent(this.props.mxEvent)}
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@ module.exports = React.createClass({
 | 
				
			|||||||
    render: function() {
 | 
					    render: function() {
 | 
				
			||||||
        var content = this.props.mxEvent.getContent();
 | 
					        var content = this.props.mxEvent.getContent();
 | 
				
			||||||
        return (
 | 
					        return (
 | 
				
			||||||
            <span className="mx_UnknownMessageTile">
 | 
					            <span className="mx_UnknownBody">
 | 
				
			||||||
                {content.body}
 | 
					                {content.body}
 | 
				
			||||||
            </span>
 | 
					            </span>
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user