OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix 12/24h in Reply/ReplyPreview 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2018-02-16 21:14:03 +00:00
parent cb293a852d
commit f1a3592eff
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/elements/Reply.js
View File

@ -197,7 +197,10 @@ export default class Reply extends React.Component {
return <blockquote className="mx_Reply" key={ev.getId()}> return <blockquote className="mx_Reply" key={ev.getId()}>
{ dateSep } { dateSep }
<EventTile mxEvent={ev} tileShape="reply" onWidgetLoad={this.props.onWidgetLoad} /> <EventTile mxEvent={ev}
tileShape="reply"
onWidgetLoad={this.props.onWidgetLoad}
isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
</blockquote>; </blockquote>;
}); });

7
src/components/views/rooms/ReplyPreview.js
View File

@ -19,6 +19,7 @@ import dis from '../../../dispatcher';
import sdk from '../../../index'; import sdk from '../../../index';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import RoomViewStore from '../../../stores/RoomViewStore'; import RoomViewStore from '../../../stores/RoomViewStore';
import SettingsStore from "../../../settings/SettingsStore";
function cancelQuoting() { function cancelQuoting() {
dis.dispatch({ dis.dispatch({
@ -71,7 +72,11 @@ export default class ReplyPreview extends React.Component {
onClick={cancelQuoting} /> onClick={cancelQuoting} />
</div> </div>
<div className="mx_ReplyPreview_clear" /> <div className="mx_ReplyPreview_clear" />
<EventTile mxEvent={this.state.event} last={true} tileShape="reply_preview" onWidgetLoad={dummyOnWidgetLoad} /> <EventTile last={true}
tileShape="reply_preview"
mxEvent={this.state.event}
onWidgetLoad={dummyOnWidgetLoad}
isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
</div> </div>
</div>; </div>;
} }