Fix render during interactive readyState (#1151)

shakacode · Oct 3, 2018 · 46350ce · 46350ce · mmaloon · Oct 6, 2018
1 parent 56bec6c
commit 46350ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
+- Fix client startup invoking render prematurely.  Closes [issue #1150](https://github.com/shakacode/react_on_rails/issues/1150).
 
 ### [11.1.4] - 2018-09-12
 

diff --git a/node_package/src/clientStartup.js b/node_package/src/clientStartup.js
@@ -198,9 +198,7 @@ export function clientStartup(context) {
 
   window.setTimeout(() => {
     if (!turbolinksInstalled() || !turbolinksSupported()) {
-      if (document.readyState === 'complete' ||
-                                   (document.readyState !== 'loading' && !document.documentElement.doScroll)
-      ) {
+      if (document.readyState === 'complete') {
         debugTurbolinks(
           'NOT USING TURBOLINKS: DOM is already loaded, calling reactOnRailsPageLoaded',
         );