react-on-rails - npm Package Compare versions

Comparing version 6.3.3 to 6.3.4

CHANGELOG.md

@@ -9,4 +9,8 @@ # Change Log
 
+## [6.3.4] - 2016-12-25
+##### Fixed
+- Disable Turbolinks support when not supported. [#650](https://github.com/shakacode/react_on_rails/pull/650) by [ka2n](https://github.com/ka2n).
+
 ## [6.3.3] - 2016-12-25
-##### Changed
+##### Fixed
 - By using the hook on `turbolinks:before-visit` to unmount the components, we can ensure that components are unmounted even when Turbolinks cache is disabled. Previously, we used `turbolinks:before-cache` event hook. [#644](https://github.com/shakacode/react_on_rails/pull/644) by [volkanunsal](https://github.com/volkanunsal).
@@ -413,3 +417,4 @@ - Added support for Ruby 2.0 [#651](https://github.com/shakacode/react_on_rails/pull/651) by [bbonamin](https://github.com/bbonamin).
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.3.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.3.4...master
+[6.3.4]: https://github.com/shakacode/react_on_rails/compare/6.3.3...6.3.4
 [6.3.3]: https://github.com/shakacode/react_on_rails/compare/6.3.2...6.3.3
@@ -416,0 +421,0 @@ [6.3.2]: https://github.com/shakacode/react_on_rails/compare/6.3.1...6.3.2

node_package/lib/clientStartup.js

@@ -91,2 +91,6 @@ 'use strict';
 
+function turbolinksSupported() {
+  return Turbolinks.supported;
+}
+
 function delegateToRenderer(componentObj, props, railsContext, domNodeId, trace) {
@@ -202,15 +206,17 @@ var name = componentObj.name,
 
-    if (!turbolinksInstalled()) {
+    if (turbolinksInstalled() && turbolinksSupported()) {
+      if (turbolinksVersion5()) {
+        debugTurbolinks('USING TURBOLINKS 5: document added event listeners ' + ' turbolinks:before-visit and turbolinks:load.');
+        document.addEventListener('turbolinks:before-visit', reactOnRailsPageUnloaded);
+        document.addEventListener('turbolinks:load', reactOnRailsPageLoaded);
+      } else {
+        debugTurbolinks('USING TURBOLINKS 2: document added event listeners page:before-unload and ' + 'page:change.');
+        document.addEventListener('page:before-unload', reactOnRailsPageUnloaded);
+        document.addEventListener('page:change', reactOnRailsPageLoaded);
+      }
+    } else {
       debugTurbolinks('NOT USING TURBOLINKS: DOMContentLoaded event, calling reactOnRailsPageLoaded');
       reactOnRailsPageLoaded();
-    } else if (turbolinksVersion5()) {
-      debugTurbolinks('USING TURBOLINKS 5: document added event listeners ' + ' turbolinks:before-visit and turbolinks:load.');
-      document.addEventListener('turbolinks:before-visit', reactOnRailsPageUnloaded);
-      document.addEventListener('turbolinks:load', reactOnRailsPageLoaded);
-    } else {
-      debugTurbolinks('USING TURBOLINKS 2: document added event listeners page:before-unload and ' + 'page:change.');
-      document.addEventListener('page:before-unload', reactOnRailsPageUnloaded);
-      document.addEventListener('page:change', reactOnRailsPageLoaded);
     }
   });
 }

package.json

 {
   "name": "react-on-rails",
-  "version": "6.3.3",
+  "version": "6.3.4",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
@@ -5,0 +5,0 @@ "main": "node_package/lib/ReactOnRails.js",

No alert changes

Improved metrics

Total package byte prevSize

108846

increased by0.35%

Lines of code

799

increased by0.63%

No dependency changes