wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-19 12:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prop-types

Browse Source
This commit is contained in:
Wyatt Johnson
2017-09-08 00:44:09 -06:00
parent deb69d4e8c 589189023a
commit 2e350c2244
226 changed files with 5095 additions and 3447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed-stream/src/components/EditableCommentContent.js
+4 -4
View File
@@ -137,15 +137,15 @@ export class EditableCommentContent extends React.Component {
<span className={styles.editWindowRemaining}>
{
this.isEditWindowExpired()
? <span>
? <span>
{t('edit_comment.edit_window_expired')}
{
typeof this.props.stopEditing === 'function'
? <span>&nbsp;<a className={styles.link} onClick={this.props.stopEditing}>{t('edit_comment.edit_window_expired_close')}</a></span>
: null
? <span>&nbsp;<a className={styles.link} onClick={this.props.stopEditing}>{t('edit_comment.edit_window_expired_close')}</a></span>
: null
}
</span>
: <span>
: <span>
<Icon name="timer" className={styles.timerIcon}/> {t('edit_comment.edit_window_timer_prefix')}
<CountdownSeconds
until={this.getEditableUntil()}