lib/action_view/helpers/component.rb in extjs-mvc-0.1.15 vs lib/action_view/helpers/component.rb in extjs-mvc-0.1.16

@@ -1,10 +1,19 @@
 module ExtJS::Helpers
   module Component
-    def extjs_component(params)
-      ExtJS::Component.new(self, params)
+    def extjs_component(*params)
+      ExtJS::Component.new(self, params.extract_options!)
     end
+
+    def extjs_onready(*params)	
+        output = ''
+	params.each do |cmp|
+	    output += (cmp.kind_of?(ExtJS::Component)) ? cmp.render : cmp
+	end
+	"<script>Ext.onReady(function() { #{output} });</script>"
+    end
+
   end
 end
 
 class ExtJS::Component
   attr_accessor :config
@@ -24,27 +33,25 @@
   end
 
   def add(*config)
     options = config.extract_options!
     if !options.keys.empty?
-	if options[:partial]
+	if url = options.delete(:partial)
 	    # rendering a partial, cache the config until partial calls #add method.  @see else.
-	    url = options.delete(:partial)
 	    @partial_config = options
 	    return @controller.render(:partial => url, :locals => {:container => self})
 	else
 	    options.merge!(@partial_config) unless @partial_config.nil?
 	    @config[:items] << options
 	end
     elsif !config.empty? && config.first.kind_of?(ExtJS::Component)
 	cmp = config.first
-	cmp.apply(@partial_config) unless @partial_config.nil?
+        cmp.apply(@partial_config) unless @partial_config.nil?
 	@config[:items] << cmp.config
     end
     @partial_config = nil
   end
 
   def render
-    cmp = "Ext.ComponentMgr.create(#{@config.to_json});"
-    "Ext.onReady(function() {#{cmp}});"
+    "Ext.ComponentMgr.create(#{@config.to_json});"
   end
 end