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

Merge pull request #1445 from matrix-org/luke/fix-editable-item-list 

Fix a couple of bugs with EditableItemList
pull/21833/head
Luke Barnard 2017-10-04 13:22:46 +01:00 committed by GitHub
parent 1938a767a2 9e3954865a
commit 9f39a15163
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/elements/EditableItemList.js
View File

@ -104,7 +104,7 @@ module.exports = React.createClass({
if (value.length === 0) {
this.onItemRemoved(index);
} else {
this.onItemEdited(value, index);
this.props.onItemEdited(value, index);
}
},

4
src/components/views/elements/EditableText.js
View File

@ -65,7 +65,9 @@ module.exports = React.createClass({
},
componentWillReceiveProps: function(nextProps) {
if (nextProps.initialValue !== this.props.initialValue) {
if (nextProps.initialValue !== this.props.initialValue ||
nextProps.initialValue !== this.value
) {
this.value = nextProps.initialValue;
if (this.refs.editable_div) {
this.showPlaceholder(!this.value);