Merge pull request react-bootstrap#82 from vga-/master

taion · taion · commit 19de54620621 · 2016-04-27T23:28:03.000-04:00
add additional check to Modal componentWillUpdate, fixes react-bootstrap#81
diff --git a/src/Modal.js b/src/Modal.js
@@ -301,7 +301,7 @@ const Modal = React.createClass({
   },
 
   componentWillUpdate(nextProps){
-    if (nextProps.show) {
+    if (!this.props.show && nextProps.show) {
       this.checkForFocus();
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ const Modal = React.createClass({`
`301`	`301`	`},`
`302`	`302`
`303`	`303`	`componentWillUpdate(nextProps){`
`304`		`- if (nextProps.show) {`
	`304`	`+ if (!this.props.show && nextProps.show) {`
`305`	`305`	`this.checkForFocus();`
`306`	`306`	`}`
`307`	`307`	`},`