Merge branch 'master' into prep-for-2.6.1

BookOfGreg · BookOfGreg · commit ac835dd870ae · 2019-09-27T09:56:49.000+01:00
diff --git a/react_ujs/index.js b/react_ujs/index.js
@@ -103,7 +103,7 @@ var ReactRailsUJS = {
         }
         throw new Error(message + ". Make sure your component is available to render.")
       } else {
-        let component = this.components[cacheId];
+        var component = this.components[cacheId];
         if(component === undefined) {
           component = React.createElement(constructor, props);
           if(turbolinksPermanent) {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ var ReactRailsUJS = {`
`103`	`103`	`}`
`104`	`104`	`throw new Error(message + ". Make sure your component is available to render.")`
`105`	`105`	`} else {`
`106`		`- let component = this.components[cacheId];`
	`106`	`+ var component = this.components[cacheId];`
`107`	`107`	`if(component === undefined) {`
`108`	`108`	`component = React.createElement(constructor, props);`
`109`	`109`	`if(turbolinksPermanent) {`