lib/framework/rho/render.rb in rhodes-2.1.0 vs lib/framework/rho/render.rb in rhodes-2.2.0.beta.1

@@ -20,34 +20,42 @@
 
     def self.get_layout_name
       @layout.nil? ? 'layout' : @layout
     end
 
-    def self.renderfile(filename)
+    def self.renderfile(filename, req = {}, res = {})
       res = ""
       if File.extname(filename) == '.iseq'
-        res = render_index(filename)
+        res = (RhoController.new).inst_render_index(filename, req, res)
       else
         res = IO.read(filename)
       end
       RhoController.start_objectnotify()
       RhoController.start_geoview_notification()
       res
     end
 
-    def inst_render_index(filename)
+    def inst_render_index(filename, req, res)
       rho_info 'inst_render_index'
-      @request, @response = {}
-      @params = {}
+      @request, @response = req, res
+      @params = RhoSupport::query_params req
+      
+      #@request, @response = {}
+      #@params = {}
       require 'rho/rhoviewhelpers'
-      layout = File.dirname(filename) + "/layout_erb.iseq"
+      
       @content = eval_compiled_file(filename, getBinding() )
-      @content = eval_compiled_file(layout, getBinding() ) if Rho::file_exist?(layout)
+      if !xhr?
+          rho_info 'index layout' 
+          layout = File.dirname(filename) + "/layout_erb.iseq"
+          @content = eval_compiled_file(layout, getBinding() ) if Rho::file_exist?(layout)
+	  else
+          if @request["headers"]["Transition-Enabled"] == "true"
+			  @content = "<div>#{@content}</div>"
+          end
+      end
+          
       @content
-    end
-
-    def self.render_index(filename)
-      (RhoController.new).inst_render_index(filename)
     end
 
     def getBinding
         binding
     end