PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1021 from Bitim/feature/rtl-languages-support

Browse source 
Better RTL support
This commit is contained in:
Matthew Hodgson 2017-06-08 14:43:18 +01:00 committed by GitHub
commit c173861b27
8 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/messages/SenderProfile.js
View file

@ -30,7 +30,7 @@ export default function SenderProfile(props) {
} }
return ( return (
<EmojiText className="mx_SenderProfile" <EmojiText className="mx_SenderProfile" dir="auto"
onClick={props.onClick}>{`${name || ''} ${props.aux || ''}`}</EmojiText> onClick={props.onClick}>{`${name || ''} ${props.aux || ''}`}</EmojiText>
); );
} }

4
src/components/views/rooms/EntityTile.js
View file

@ -115,7 +115,7 @@ module.exports = React.createClass({
nameEl = ( nameEl = (
<div className="mx_EntityTile_details"> <div className="mx_EntityTile_details">
<img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12"/> <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12"/>
<EmojiText element="div" className="mx_EntityTile_name_hover">{name}</EmojiText> <EmojiText element="div" className="mx_EntityTile_name_hover" dir="auto">{name}</EmojiText>
<PresenceLabel activeAgo={ activeAgo } <PresenceLabel activeAgo={ activeAgo }
currentlyActive={this.props.presenceCurrentlyActive} currentlyActive={this.props.presenceCurrentlyActive}
presenceState={this.props.presenceState} /> presenceState={this.props.presenceState} />
@ -124,7 +124,7 @@ module.exports = React.createClass({
} }
else { else {
nameEl = ( nameEl = (
<EmojiText element="div" className="mx_EntityTile_name">{name}</EmojiText> <EmojiText element="div" className="mx_EntityTile_name" dir="auto">{name}</EmojiText>
); );
} }

1
src/components/views/rooms/MessageComposerInput.js
View file

@ -721,6 +721,7 @@ export default class MessageComposerInput extends React.Component {
title={ this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")} title={ this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
src={`img/button-md-${!this.state.isRichtextEnabled}.png`} /> src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
<Editor ref="editor" <Editor ref="editor"
dir="auto"
placeholder={this.props.placeholder} placeholder={this.props.placeholder}
editorState={this.state.editorState} editorState={this.state.editorState}
onChange={this.onEditorContentChanged} onChange={this.onEditorContentChanged}

2
src/components/views/rooms/MessageComposerInputOld.js
View file

@ -461,7 +461,7 @@ export default React.createClass({
render: function() { render: function() {
return ( return (
<div className="mx_MessageComposer_input" onClick={ this.onInputClick }> <div className="mx_MessageComposer_input" onClick={ this.onInputClick }>
<textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder} <textarea dir="auto" autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder}
onPaste={this._onPaste} onPaste={this._onPaste}
/> />
</div> </div>

4
src/components/views/rooms/RoomHeader.js
View file

@ -238,7 +238,7 @@ module.exports = React.createClass({
const emojiTextClasses = classNames('mx_RoomHeader_nametext', { mx_RoomHeader_settingsHint: settingsHint }); const emojiTextClasses = classNames('mx_RoomHeader_nametext', { mx_RoomHeader_settingsHint: settingsHint });
name = name =
<div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}> <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
<EmojiText element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText> <EmojiText dir="auto" element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText>
{ searchStatus } { searchStatus }
</div>; </div>;
} }
@ -255,7 +255,7 @@ module.exports = React.createClass({
} }
} }
if (topic) { if (topic) {
topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic }>{ topic }</div>; topic_el = <div className="mx_RoomHeader_topic" ref="topic" title={ topic } dir="auto">{ topic }</div>;
} }
} }

4
src/components/views/rooms/RoomNameEditor.js
View file

@ -55,9 +55,9 @@ module.exports = React.createClass({
placeholderClassName="mx_RoomHeader_placeholder" placeholderClassName="mx_RoomHeader_placeholder"
placeholder={ this._placeholderName } placeholder={ this._placeholderName }
blurToCancel={ false } blurToCancel={ false }
initialValue={ this._initialName }/> initialValue={ this._initialName }
dir="auto" />
</div> </div>
); );
}, },
}); });

6
src/components/views/rooms/RoomTile.js
View file

@ -224,13 +224,13 @@ module.exports = React.createClass({
if (this.props.selected) { if (this.props.selected) {
let nameSelected = <EmojiText>{name}</EmojiText>; let nameSelected = <EmojiText>{name}</EmojiText>;
label = <div title={ name } className={ nameClasses }>{ nameSelected }</div>; label = <div title={ name } className={ nameClasses } dir="auto">{ nameSelected }</div>;
} else { } else {
label = <EmojiText element="div" title={ name } className={ nameClasses }>{name}</EmojiText>; label = <EmojiText element="div" title={ name } className={ nameClasses } dir="auto">{name}</EmojiText>;
} }
} else if (this.state.hover) { } else if (this.state.hover) {
var RoomTooltip = sdk.getComponent("rooms.RoomTooltip"); var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} />; tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} dir="auto" />;
} }
//var incomingCallBox; //var incomingCallBox;

3
src/components/views/rooms/RoomTopicEditor.js
View file

@ -46,7 +46,8 @@ module.exports = React.createClass({
placeholderClassName="mx_RoomHeader_placeholder" placeholderClassName="mx_RoomHeader_placeholder"
placeholder={_t("Add a topic")} placeholder={_t("Add a topic")}
blurToCancel={ false } blurToCancel={ false }
initialValue={ this._initialTopic }/> initialValue={ this._initialTopic }
dir="auto" />
); );
}, },
}); });