ajax 1.1.1 → 1.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    ajax (1.1.1)
+    ajax (1.1.2)
       json
       rack
 

data/README.rdoc

@@ -10,6 +10,7 @@ As of May 2010 Ajax is being used live in production on kazaa.com[http://www.kaz
 
 == Changelog
 
+* v1.1.2: Fix Rails 3 render hook so it doesn't break rendering with no layout e.g. <tt>render :json => ...</tt>
 * v1.1.1: Backwards compatibility fix for Rails < 3
 * v1.1.0: Rails 3 supported!
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/ajax/action_controller.rb

@@ -125,22 +125,19 @@ module Ajax
         end
       end
 
-      #
-      # Intercept rendering to customize the headers and layout handling
-      #
-      def render_to_body(options = {})
-        return super if !request.xhr? || !Ajax.is_enabled?
-        _process_options(options)
-
-        if ajax_layout = _layout_for_ajax(options[:layout])
-          options[:layout] = ajax_layout.virtual_path
+      # Specialize the default layout finder.  Try to use a layout in layouts/ajax
+      # as the default layout, if one exists.
+      def _default_layout(require_layout = false)
+        if require_layout || !request.xhr? || !Ajax.is_enabled?
+          super
+        else
+          layout_name = super
+          if ajax_layout = _layout_for_ajax(layout_name)
+            ajax_layout.virtual_path
+          else
+            layout_name
+          end
         end
-
-        # Send the current layout and controller in a custom response header
-        Ajax.set_header(response, :layout, options[:layout])
-        Ajax.set_header(response, :controller, self.class.controller_name)
-
-        _render_template(options)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ajax
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Karl Varga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -07:00
+date: 2011-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency