Merge pull request #84 from digitalcuisine/happy-browserify

Remove need for global workaround and make Browserify happy

Author: zpao

lib/react/renderer.rb

@@ -23,6 +23,8 @@ def self.render(component, args={})
     def self.setup_combined_js
       <<-CODE
         var global = global || this;
+        var self = self || this;
+        var window = window || this;
 
         var console = global.console || {};
         ['error', 'log', 'info', 'warn'].forEach(function (fn) {

test/dummy/app/assets/javascripts/components.js

@@ -1,8 +1,2 @@
 //= require_self
 //= require_tree ./components
-
-// This is because we compile this file into a JS VM
-// for server rendering, and some components may be
-// .coffee and wrapped in a func, so they need a
-// global to glom on to.
-var self, window, global = global || window || self;

test/dummy/app/assets/javascripts/components/Todo.js.jsx.coffee

@@ -6,4 +6,4 @@ Todo = React.createClass
 
 # Because Coffee files are in an anonymous function,
 # expose it for server rendering tests
-global.Todo = Todo
+window.Todo = Todo