react-rails 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f334d2c029d0618856f87380e5f383c41dd1de3d
-  data.tar.gz: a99014219803125228a7c01f7b4fce09beab20a7
+  metadata.gz: 1e6c53ba3d29462804973f19b4e07ad1dda5bedb
+  data.tar.gz: d6e06f1f5e964a406362a56a0ad9e9d6ee4c6c7f
 SHA512:
-  metadata.gz: 179cef5ad9262a265d2c985a54c4f54e064b87aa7078382080fd18dab01dd243dc63257eefdc41d945d71f2ab5fd896fecfd07c55d03ce66c71a376e51ab438a
-  data.tar.gz: deb80234836320e2cf829ea0b1de79a22473598054d4356af10c0255a36b275e73f247a4d115ec484ec462809ba51f722507d423ca39971ed83abcb8f921bcc1
+  metadata.gz: e7ca70e535d329bd3067c2ea242d71631b4d7fb9573832ef69915bd2f17706b4fb55eae429d10910d5c373fde6e190b6451ec56b9d0afb94cd9cd41f6a0d2689
+  data.tar.gz: bad31f47872e3c1fb589b56e44c8cb758447d9db3d01a4acc069f2b020864e53f06e889057d966f71ca2cc66cd37e54f6b7612555147aa012ec0dd5f638f64b4

data/lib/assets/javascripts/react_ujs.js.erb

@@ -14,17 +14,29 @@
     // `data-react-class` DOM elements
     findDOMNodes: function(searchSelector) {
       // we will use fully qualified paths as we do not bind the callbacks
-      var selector;
-      if (typeof searchSelector === 'undefined') {
-        var selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
-      } else {
-        var selector = searchSelector + ' [' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
+      var selector, parent;
+
+      switch (typeof searchSelector) {
+        case 'undefined':
+          selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
+          parent = document;
+          break;
+        case 'object':
+          selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
+          parent = searchSelector;
+          break;
+        case 'string':
+          selector = searchSelector + ' [' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
+          parent = document;
+          break
+        default:
+          break;
       }
 
       if ($) {
-        return $(selector);
+        return $(selector, parent);
       } else {
-        return document.querySelectorAll(selector);
+        return parent.querySelectorAll(selector);
       }
     },
 
@@ -41,7 +53,10 @@
         var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
         var props = propsJson && JSON.parse(propsJson);
 
-        React.render(React.createElement(constructor, props), node);
+        // Prefer ReactDOM if defined (introduced in 0.14)
+        var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
+
+        renderer.render(React.createElement(constructor, props), node);
       }
     },
 

data/lib/react/rails/version.rb

@@ -1,6 +1,6 @@
 module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Paul O’Shannessy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal