Merge branch 'pr/11'

kaivi · kaivi · commit f3ddcf58abdf · 2016-01-25T15:45:02.000+01:00
diff --git a/demo/index.js b/demo/index.js
@@ -257,7 +257,7 @@
 	    }, {
 	        key: 'componentWillReceiveProps',
 	        value: function componentWillReceiveProps(nextProps) {
-	            if (nextProps.text !== this.state.text) {
+	            if (nextProps.text !== this.props.text) {
 	                this.setState({ text: nextProps.text });
 	            }
 	        }
diff --git a/index.js b/index.js
@@ -87,7 +87,7 @@ var InlineEdit = function (_React$Component) {
     }, {
         key: 'componentWillReceiveProps',
         value: function componentWillReceiveProps(nextProps) {
-            if (nextProps.text !== this.state.text) {
+            if (nextProps.text !== this.props.text) {
                 this.setState({ text: nextProps.text });
             }
         }
diff --git a/index.jsx b/index.jsx
@@ -46,7 +46,7 @@ export default class InlineEdit extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        if (nextProps.text !== this.state.text) {
+        if (nextProps.text !== this.props.text) {
             this.setState({ text: nextProps.text });
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@`
`257`	`257`	`}, {`
`258`	`258`	`key: 'componentWillReceiveProps',`
`259`	`259`	`value: function componentWillReceiveProps(nextProps) {`
`260`		`- if (nextProps.text !== this.state.text) {`
	`260`	`+ if (nextProps.text !== this.props.text) {`
`261`	`261`	`this.setState({ text: nextProps.text });`
`262`	`262`	`}`
`263`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ var InlineEdit = function (_React$Component) {`
`87`	`87`	`}, {`
`88`	`88`	`key: 'componentWillReceiveProps',`
`89`	`89`	`value: function componentWillReceiveProps(nextProps) {`
`90`		`- if (nextProps.text !== this.state.text) {`
	`90`	`+ if (nextProps.text !== this.props.text) {`
`91`	`91`	`this.setState({ text: nextProps.text });`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export default class InlineEdit extends React.Component {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`componentWillReceiveProps(nextProps) {`
`49`		`- if (nextProps.text !== this.state.text) {`
	`49`	`+ if (nextProps.text !== this.props.text) {`
`50`	`50`	`this.setState({ text: nextProps.text });`
`51`	`51`	`}`
`52`	`52`	`}`