Skip to content

Commit 8949135

Browse files
committed
Post editor fixes
1 parent 5392c8b commit 8949135

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

src/components/ActionCard/CommentEditToggle.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ export default class CommentEditToggle extends React.Component {
4040
<div className="dropdownContainer">
4141
<Dropdown pointerShadow className="drop-down edit-toggle-container">
4242
<div className={cn('dropdown-menu-header', 'edit-toggle')} >
43-
{this.props.forTopic && <SVGIconImage filePath="arrows-16px-3_small-down" />}
44-
{!this.props.forTopic && <SVGIconImage filePath="ui-16px-1_edit-73" />}
43+
<SVGIconImage filePath="ui-16px-1_edit-73" />
4544

4645
</div>
4746
<div className="dropdown-menu-list down-layer">
@@ -50,10 +49,11 @@ export default class CommentEditToggle extends React.Component {
5049
onItemClick={this.onEdit}
5150
currentSelection=""
5251
/>
52+
{! this.props.hideDelete &&
5353
<DropdownItem key={2} item={deleteOptions}
5454
onItemClick={this.showDelete}
5555
currentSelection=""
56-
/>
56+
/>}
5757
</ul>
5858
</div>
5959
</Dropdown>

src/components/Feed/FeedComments.jsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ class FeedComments extends React.Component {
2323
this.state = { showAll: false }
2424
}
2525

26-
onEditMessage(messageId) {
27-
this.props.onEditMessage(messageId)
28-
}
2926
onSaveMessageChange(messageId, content, editMode) {
3027
this.props.onSaveMessageChange(messageId, content, editMode)
3128
}
@@ -80,10 +77,8 @@ class FeedComments extends React.Component {
8077
avatarUrl={ _.get(item, 'author.photoURL', null)}
8178
authorName={item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Connect user'}
8279
date={moment(item.date).fromNow()}
83-
edited={item.edited}
8480
active={item.unread}
8581
self={item.author && item.author.userId === currentUser.userId}
86-
onEdit={this.onEditMessage.bind(this, item.id)}
8782
onChange={this.onSaveMessageChange.bind(this, item.id)}
8883
onSave={onSaveMessage}
8984
onDelete={onDeleteMessage}

src/components/Feed/draftjs.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,14 @@
9191
border-left: $corner-radius * 2 solid $tc-gray-10
9292
}
9393
pre {
94-
background: #ddd;
94+
background: #fafafb;
9595
padding: 10px;
9696
font-family: Roboto Mono, SF Mono, monospace;
97+
font-size: 13px;
98+
font-weight: normal;
99+
color: #333;
100+
border: 1px solid #ededf2;
101+
border-radius: 4px;
97102
}
98103
strong {
99104
font-weight: bold;

src/projects/reducers/projectTopics.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,8 @@ export const projectTopics = function (state=initialState, action) {
461461
error: { $set : false },
462462
rawContent: { $set : rawContent },
463463
body: { $set : savedComment.body },
464-
date: { $set : savedComment.date }
464+
date: { $set : savedComment.updatedDate },
465+
edited: {$set : true }
465466
})
466467

467468
const updatedFeed = update(feed, { posts: { $splice: [[commentIndex, 1, updatedComment]] } })

0 commit comments

Comments
 (0)