Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Clarify non-e2e vs. e2e /w composers placeholder #720

Merged
merged 2 commits into from
Feb 22, 2017
Merged

Clarify non-e2e vs. e2e /w composers placeholder #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd146a7
Clarify non-e2e vs. e2e /w composers placeholder
Feb 21, 2017
799e5ee
Less jargon
Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/components/views/rooms/MessageComposer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ export default class MessageComposer extends React.Component {
);

let e2eImg, e2eTitle, e2eClass;

if (MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId)) {
const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
if (roomIsEncrypted) {
// FIXME: show a /!\ if there are untrusted devices in the room...
e2eImg = 'img/e2e-verified.svg';
e2eTitle = 'Encrypted room';
Expand Down Expand Up @@ -286,12 +286,16 @@ export default class MessageComposer extends React.Component {
key="controls_formatting" />
);

const placeholderText = roomIsEncrypted ?
"Send a message (unencrypted)…" : "Send a message…";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've just spotted a problem with this... ;)


controls.push(
<MessageComposerInput
ref={c => this.messageComposerInput = c}
key="controls_input"
onResize={this.props.onResize}
room={this.props.room}
placeholder={placeholderText}
tryComplete={this._tryComplete}
onUpArrow={this.onUpArrow}
onDownArrow={this.onDownArrow}
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/rooms/MessageComposerInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ export default class MessageComposerInput extends React.Component {
title={`Markdown is ${this.state.isRichtextEnabled ? 'disabled' : 'enabled'}`}
src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
<Editor ref="editor"
placeholder="Type a message…"
placeholder={this.props.placeholder}
editorState={this.state.editorState}
onChange={this.onEditorContentChanged}
blockStyleFn={MessageComposerInput.getBlockStyle}
Expand Down
5 changes: 4 additions & 1 deletion src/components/views/rooms/MessageComposerInputOld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ export default React.createClass({

// js-sdk Room object
room: React.PropTypes.object.isRequired,

// The text to use a placeholder in the input box
placeholder: React.PropTypes.string.isRequired,
},

componentWillMount: function() {
Expand Down Expand Up @@ -442,7 +445,7 @@ export default React.createClass({
render: function() {
return (
<div className="mx_MessageComposer_input" onClick={ this.onInputClick }>
<textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder="Type a message..." />
<textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder} />
</div>
);
}
Expand Down