Merge pull request #63 from arBmind/fix_rails41x_server_rendering

zpao · zpao · commit 58597b624218 · 2014-07-12T18:03:40.000-07:00
Fix rails41x server rendering
diff --git a/lib/react/rails/view_helper.rb b/lib/react/rails/view_helper.rb
@@ -8,7 +8,7 @@ module ViewHelper
       #
       def react_component(name, args = {}, options = {}, &block)
         options = {:tag => options} if options.is_a?(Symbol)
-        block = Proc.new{React::Renderer.render(name, args)} if options[:prerender] == true
+        block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender] == true
 
         html_options = options.reverse_merge(:data => {})
         html_options[:data].tap do |data|

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ module ViewHelper`
`8`	`8`	`#`
`9`	`9`	`def react_component(name, args = {}, options = {}, &block)`
`10`	`10`	`options = {:tag => options} if options.is_a?(Symbol)`
`11`		`- block = Proc.new{React::Renderer.render(name, args)} if options[:prerender] == true`
	`11`	`+ block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender] == true`
`12`	`12`
`13`	`13`	`html_options = options.reverse_merge(:data => {})`
`14`	`14`	`html_options[:data].tap do \|data\|`