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

Merge branch 'master' into fix-test

Browse Source
This commit is contained in:
Wyatt Johnson
2017-01-03 07:41:44 -07:00
committed by GitHub
parent 5c6df6d481 fd2b01d5ed
commit 0dde122e9b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/components/CommentList.js
+1 -3
View File
@@ -25,9 +25,7 @@ export default class CommentList extends React.Component {
loading: PropTypes.bool,
// list of actions (flags, etc) associated with the comments
actions: PropTypes.shape({
ids: PropTypes.arrayOf(PropTypes.string)
}),
actions: PropTypes.arrayOf(PropTypes.string),
suspectWords: PropTypes.arrayOf(PropTypes.string)
}
client/coral-ui/components/Dialog.js
+3 -1
View File
@@ -42,7 +42,9 @@ export default class Dialog extends Component {
componentWillUnmount() {
const dialog = this.dialog;
dialog.removeEventListener('cancel', this.props.onCancel);
if (dialog) {
dialog.removeEventListener('cancel', this.props.onCancel);
}
}
render() {