rename EditableText's placeHolder parameter to be 'label' to avoid colliding with the HTML5 placeholder parameter

This commit is contained in:
Matthew Hodgson
2015-07-20 16:31:11 -07:00
parent e0673eee29
commit fe71f69f0a
8 changed files with 60 additions and 16 deletions

View File

@@ -22,6 +22,7 @@ module.exports = {
propTypes: {
onValueChanged: React.PropTypes.func,
initialValue: React.PropTypes.string,
label: React.PropTypes.string,
placeHolder: React.PropTypes.string,
},
@@ -34,7 +35,8 @@ module.exports = {
return {
onValueChanged: function() {},
initialValue: '',
placeHolder: 'Click to set',
label: 'Click to set',
placeholder: '',
};
},
@@ -77,6 +79,7 @@ module.exports = {
this.setState({
phase: this.Phases.Display,
});
this.onValueChanged(false);
},
onValueChanged: function(shouldSubmit) {

View File

@@ -200,7 +200,7 @@ module.exports = {
}, function(err) {
console.error("Command failure: %s", err);
Modal.createDialog(ErrorDialog, {
title: "Server Error",
title: "Server error",
description: err.message
});
});
@@ -208,7 +208,7 @@ module.exports = {
else if (cmd.error) {
console.error(cmd.error);
Modal.createDialog(ErrorDialog, {
title: "Command Error",
title: "Command error",
description: cmd.error
});
}

View File

@@ -101,7 +101,7 @@ module.exports = {
}, function(err) {
console.error("Failed to invite: %s", JSON.stringify(err));
Modal.createDialog(ErrorDialog, {
title: "Invite Server Error",
title: "Server error whilst inviting",
description: err.message
});
self.setState({