react-rails 1.3.1 → 1.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f334d2c029d0618856f87380e5f383c41dd1de3d
4
- data.tar.gz: a99014219803125228a7c01f7b4fce09beab20a7
3
+ metadata.gz: 1e6c53ba3d29462804973f19b4e07ad1dda5bedb
4
+ data.tar.gz: d6e06f1f5e964a406362a56a0ad9e9d6ee4c6c7f
5
5
  SHA512:
6
- metadata.gz: 179cef5ad9262a265d2c985a54c4f54e064b87aa7078382080fd18dab01dd243dc63257eefdc41d945d71f2ab5fd896fecfd07c55d03ce66c71a376e51ab438a
7
- data.tar.gz: deb80234836320e2cf829ea0b1de79a22473598054d4356af10c0255a36b275e73f247a4d115ec484ec462809ba51f722507d423ca39971ed83abcb8f921bcc1
6
+ metadata.gz: e7ca70e535d329bd3067c2ea242d71631b4d7fb9573832ef69915bd2f17706b4fb55eae429d10910d5c373fde6e190b6451ec56b9d0afb94cd9cd41f6a0d2689
7
+ data.tar.gz: bad31f47872e3c1fb589b56e44c8cb758447d9db3d01a4acc069f2b020864e53f06e889057d966f71ca2cc66cd37e54f6b7612555147aa012ec0dd5f638f64b4
@@ -14,17 +14,29 @@
14
14
  // `data-react-class` DOM elements
15
15
  findDOMNodes: function(searchSelector) {
16
16
  // we will use fully qualified paths as we do not bind the callbacks
17
- var selector;
18
- if (typeof searchSelector === 'undefined') {
19
- var selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
20
- } else {
21
- var selector = searchSelector + ' [' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
17
+ var selector, parent;
18
+
19
+ switch (typeof searchSelector) {
20
+ case 'undefined':
21
+ selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
22
+ parent = document;
23
+ break;
24
+ case 'object':
25
+ selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
26
+ parent = searchSelector;
27
+ break;
28
+ case 'string':
29
+ selector = searchSelector + ' [' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
30
+ parent = document;
31
+ break
32
+ default:
33
+ break;
22
34
  }
23
35
 
24
36
  if ($) {
25
- return $(selector);
37
+ return $(selector, parent);
26
38
  } else {
27
- return document.querySelectorAll(selector);
39
+ return parent.querySelectorAll(selector);
28
40
  }
29
41
  },
30
42
 
@@ -41,7 +53,10 @@
41
53
  var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
42
54
  var props = propsJson && JSON.parse(propsJson);
43
55
 
44
- React.render(React.createElement(constructor, props), node);
56
+ // Prefer ReactDOM if defined (introduced in 0.14)
57
+ var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
58
+
59
+ renderer.render(React.createElement(constructor, props), node);
45
60
  }
46
61
  },
47
62
 
@@ -1,6 +1,6 @@
1
1
  module React
2
2
  module Rails
3
3
  # If you change this, make sure to update VERSIONS.md
4
- VERSION = '1.3.1'
4
+ VERSION = '1.3.2'
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: react-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Paul O’Shannessy
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-18 00:00:00.000000000 Z
11
+ date: 2015-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: appraisal