Merge pull request #372 from reacuna/master

Robert Mosolgo · Robert Mosolgo · commit 22ffe30a6b42 · 2015-10-16T23:42:16.000-04:00
Support ReactDOM in react_ujs for unmountComponents
diff --git a/lib/assets/javascripts/react_ujs.js.erb b/lib/assets/javascripts/react_ujs.js.erb
@@ -66,7 +66,9 @@
       for (var i = 0; i < nodes.length; ++i) {
         var node = nodes[i];
 
-        React.unmountComponentAtNode(node);
+        // Prefer ReactDOM if defined (introduced in 0.14)
+        var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
+        renderer.unmountComponentAtNode(node);
       }
     }
   };

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@`
`66`	`66`	`for (var i = 0; i < nodes.length; ++i) {`
`67`	`67`	`var node = nodes[i];`
`68`	`68`
`69`		`- React.unmountComponentAtNode(node);`
	`69`	`+ // Prefer ReactDOM if defined (introduced in 0.14)`
	`70`	`+ var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;`
	`71`	`+ renderer.unmountComponentAtNode(node);`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`	`};`