{"patch":"diff --git a\/docs\/_js\/examples\/markdown.js b\/docs\/_js\/examples\/markdown.js\nindex 89facd3a26..7ea69a6147 100644\n--- a\/docs\/_js\/examples\/markdown.js\n+++ b\/docs\/_js\/examples\/markdown.js\n@@ -11,16 +11,17 @@ var MarkdownEditor = React.createClass({\\n\\\n getInitialState: function() {\\n\\\n return {value: 'Type some *markdown* here!'};\\n\\\n },\\n\\\n- handleInput: function() {\\n\\\n+ handleChange: function() {\\n\\\n this.setState({value: this.refs.textarea.getDOMNode().value});\\n\\\n },\\n\\\n render: function() {\\n\\\n return (\\n\\\n

\\n\\\n

Input<\/h3>\\n\\\n- \\n\\\n- {this.state.value}\\n\\\n- <\/textarea>\\n\\\n+ <textarea\\n\\\n+ onChange={this.handleChange}\\n\\\n+ ref=\\\"textarea\\\"\\n\\\n+ defaultValue={this.state.value} \/>\\n\\\n <h3>Output<\/h3>\\n\\\n <div\\n\\\n className=\\\"content\\\"\\n\\\ndiff --git a\/docs\/_js\/examples\/todo.js b\/docs\/_js\/examples\/todo.js\nindex 816820928b..9798cb9fa1 100644\n--- a\/docs\/_js\/examples\/todo.js\n+++ b\/docs\/_js\/examples\/todo.js\n@@ -30,8 +30,8 @@ var TodoApp = React.createClass({\\n\\\n <div>\\n\\\n <h3>TODO<\/h3>\\n\\\n <TodoList items={this.state.items} \/>\\n\\\n- <form onSubmit={this.handleSubmit.bind(this)}>\\n\\\n- <input onKeyUp={this.onKey.bind(this)} value={this.state.text} \/>\\n\\\n+ <form onSubmit={this.handleSubmit}>\\n\\\n+ <input onKeyUp={this.onKey} defaultValue={this.state.text} \/>\\n\\\n <button>{'Add #' + (this.state.items.length + 1)}<\/button>\\n\\\n <\/form>\\n\\\n <\/div>\\n\\\n","commit":{"authorName":"Paul O’Shannessy","shortRevision":"dbdf1cc296","revision":"dbdf1cc296de40786146da4bdedd8172c9f555d7","authoredAt":"2013-07-17T13:30:22-07:00","subject":"Merge branch 'chenglou-master'","authorEmail":"paul@oshannessy.com"},"files":[{"status":"M","path":"docs\/_js\/examples\/markdown.js"},{"status":"M","path":"docs\/_js\/examples\/todo.js"}],"parents":["96bd63cc4bc36791aa6b7fc4559e5c5e9e00bab7","dd14fdfdc57d9a0dd9eeb10d83daacce77a2aaa3"],"body":"Conflicts:\n\tdocs\/_js\/examples\/markdown.js"}</article></body></html>

dillon1000/react

Files changed