move api to ReactRailsUJS and update tests

robrobbins · robrobbins · commit 2a4ef6db12f7 · 2015-01-27T10:15:03.000-07:00
diff --git a/lib/assets/javascripts/react_ujs.js b/lib/assets/javascripts/react_ujs.js
@@ -1,12 +1,10 @@
 // Unobtrusive scripting adapter for React
-(function(document, window, React) {
-  
+(function(document, window) {
   // jQuery is optional. Use it to support legacy browsers.
   var $ = (typeof window.jQuery !== 'undefined') && window.jQuery;
   
-  // rather than create another namespace just for the 3 methods and 2
-  // properties we expose just append them to the `React.ujs` object
-  React.ujs = {
+  // create the  namespace
+  window.ReactRailsUJS = {
     
     CLASS_NAME_ATTR: 'data-react-class',
     
@@ -17,32 +15,32 @@
     findDOMNodes: function() {
       
       // we will use fully qualified paths as we do not bind the callbacks   
-      var selector = '[' + React.ujs.CLASS_NAME_ATTR + ']';
+      var selector = '[' + window.ReactRailsUJS.CLASS_NAME_ATTR + ']';
       
       if ($) return $(selector);
       
       else return document.querySelectorAll(selector);
     },
     
     mountComponents: function() {
-      var nodes = React.ujs.findDOMNodes();
+      var nodes = ReactRailsUJS.findDOMNodes();
       
       for (var i = 0; i < nodes.length; ++i) {
         var node = nodes[i];
-        var className = node.getAttribute(React.ujs.CLASS_NAME_ATTR);
+        var className = node.getAttribute(window.ReactRailsUJS.CLASS_NAME_ATTR);
         
         // Assume className is simple and can be found at top-level (window).
         // Fallback to eval to handle cases like 'My.React.ComponentName'.
         var constructor = window[className] || eval.call(window, className);
-        var propsJson = node.getAttribute(React.ujs.PROPS_ATTR);
+        var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
         var props = propsJson && JSON.parse(propsJson);
         
         React.render(React.createElement(constructor, props), node);
       }
     },
     
     unmountComponents: function() {
-      var nodes = React.ujs.findDOMNodes();
+      var nodes = window.ReactRailsUJS.findDOMNodes();
       
       for (var i = 0; i < nodes.length; ++i) {
         var node = nodes[i];
@@ -71,20 +69,20 @@
       };
       
     }
-    handleEvent('page:change', React.ujs.mountComponents);
-    handleEvent('page:receive', React.ujs.unmountComponents);
+    handleEvent('page:change', window.ReactRailsUJS.mountComponents);
+    handleEvent('page:receive', window.ReactRailsUJS.unmountComponents);
   }
 
   function handleNativeEvents() {
     if ($) {
       
-      $(React.ujs.mountComponents);
-      $(window).unload(React.ujs.unmountComponents);
+      $(window.ReactRailsUJS.mountComponents);
+      $(window).unload(window.ReactRailsUJS.unmountComponents);
       
     } else {
       
-      document.addEventListener('DOMContentLoaded', React.ujs.mountComponents);
-      window.addEventListener('unload', React.ujs.unmountComponents);
+      document.addEventListener('DOMContentLoaded', window.ReactRailsUJS.mountComponents);
+      window.addEventListener('unload', window.ReactRailsUJS.unmountComponents);
     }
   }
 
@@ -93,5 +91,4 @@
   } else {
     handleNativeEvents();
   }
-  
-})(document, window, React);
+})(document, window);
diff --git a/test/view_helper_test.rb b/test/view_helper_test.rb
@@ -54,21 +54,21 @@ class ViewHelperTest < ActionDispatch::IntegrationTest
     assert page.has_content?('Hello Bob')
   
     # the exposed ujs object is present
-    ujs_present = page.evaluate_script('typeof React.ujs === "object";')
+    ujs_present = page.evaluate_script('typeof ReactRailsUJS === "object";')
     assert_equal(ujs_present, true)
   
     # it contains the constants
-    class_name_present = page.evaluate_script('React.ujs.CLASS_NAME_ATTR === "data-react-class";')
+    class_name_present = page.evaluate_script('ReactRailsUJS.CLASS_NAME_ATTR === "data-react-class";')
     assert_equal(class_name_present, true)
-    props_present = page.evaluate_script('React.ujs.PROPS_ATTR === "data-react-props";')
+    props_present = page.evaluate_script('ReactRailsUJS.PROPS_ATTR === "data-react-props";')
     assert_equal(props_present, true)
   
     #it contains the methods
-    find_dom_nodes_present = page.evaluate_script('typeof React.ujs.findDOMNodes === "function";')
+    find_dom_nodes_present = page.evaluate_script('typeof ReactRailsUJS.findDOMNodes === "function";')
     assert_equal(find_dom_nodes_present, true)
-    mount_components_present = page.evaluate_script('typeof React.ujs.mountComponents === "function";')
+    mount_components_present = page.evaluate_script('typeof ReactRailsUJS.mountComponents === "function";')
     assert_equal(mount_components_present, true)
-    unmount_components_present = page.evaluate_script('typeof React.ujs.unmountComponents === "function";')
+    unmount_components_present = page.evaluate_script('typeof ReactRailsUJS.unmountComponents === "function";')
     assert_equal(unmount_components_present, true)
   end
 
