render context fixes for hyper-mesh while_loading

catmando · catmando · commit 9598a8d13082 · 2017-03-21T14:51:51.000-04:00
diff --git a/gemfiles/opal_0.10_react_13.gemfile b/gemfiles/opal_0.10_react_13.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.3.3", :require => false
diff --git a/gemfiles/opal_0.10_react_14.gemfile b/gemfiles/opal_0.10_react_14.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.6.2", :require => false
diff --git a/gemfiles/opal_0.10_react_15.gemfile b/gemfiles/opal_0.10_react_15.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.10.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.10.0", :require => false
diff --git a/gemfiles/opal_0.8_react_13.gemfile b/gemfiles/opal_0.8_react_13.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
 gem "react-rails", "~> 1.3.3", :require => false
diff --git a/gemfiles/opal_0.8_react_14.gemfile b/gemfiles/opal_0.8_react_14.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
 gem "react-rails", "~> 1.6.2", :require => false
diff --git a/gemfiles/opal_0.8_react_15.gemfile b/gemfiles/opal_0.8_react_15.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.8.0"
 gem "opal-rails", "~> 0.8.1"
 gem "react-rails", "~> 1.10.0", :require => false
diff --git a/gemfiles/opal_0.9_react_13.gemfile b/gemfiles/opal_0.9_react_13.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.3.3", :require => false
diff --git a/gemfiles/opal_0.9_react_14.gemfile b/gemfiles/opal_0.9_react_14.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.6.2", :require => false
diff --git a/gemfiles/opal_0.9_react_15.gemfile b/gemfiles/opal_0.9_react_15.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 1.9.3"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", "~> 0.9.0"
 gem "opal-rails", "~> 0.9.0"
 gem "react-rails", "~> 1.10.0", :require => false
diff --git a/gemfiles/opal_master_react_15.gemfile b/gemfiles/opal_master_react_15.gemfile
@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 ruby ">= 2.0.0"
 
-gem "hyper-store", :path => "../../hyper-store"
-gem "hyperloop-config", :path => "../../hyperloop-config"
 gem "opal", :git => "https://github.com/opal/opal.git"
 gem "opal-sprockets", :git => "https://github.com/opal/opal-sprockets.git"
 gem "opal-rails", "~> 0.9.0"
diff --git a/lib/react/rendering_context.rb b/lib/react/rendering_context.rb
@@ -17,6 +17,7 @@ def render(name, *args, &block)
               buffer = @buffer.dup
               React.create_element(name, *args) { buffer }.tap do |element|
                 element.waiting_on_resources = saved_waiting_on_resources || !!buffer.detect { |e| e.waiting_on_resources if e.respond_to?(:waiting_on_resources) }
+                element.waiting_on_resources ||= buffer.last.is_a?(String) && waiting_on_resources
               end
             elsif @buffer.last.is_a? React::Element
               @buffer.last.tap { |element| element.waiting_on_resources ||= saved_waiting_on_resources }
@@ -89,9 +90,10 @@ def remove_nodes_from_args(args)
       # so we insure that is the case, and also check to make sure that element in the buffer
       # is the element returned
 
+
       def run_child_block(is_outer_scope)
         result = yield
-        result = result.to_s if result.try :acts_as_string?
+        result = result.to_s.span if result.try :acts_as_string? || result.is_a?(String)
         @buffer << result if result.is_a?(String) || (result.is_a?(React::Element) && @buffer.empty?)
         raise_render_error(result) if is_outer_scope && @buffer != [result]
       end
