ajax 1.1.6 → 1.1.7

data/Gemfile.lock

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

data/README.rdoc

@@ -10,7 +10,8 @@ As of May 2010 Ajax is being used live in production on kazaa.com[http://www.kaz
 
 == Changelog
 
-* v1.1.6: Fix redirect_to to handle Rails 3 resourceful redirects
+* v1.1.7: Fix layout handling for Rails 3
+* v1.1.6: Fix redirect_to to handle resourceful redirects. [Rails 3]
 * v1.1.5: Fix inclusion of +controller+ and +layout+ in <tt>Ajax-Info</tt> response header.  Improve RSpec 1.* integration
 * v1.1.4: Fix RSpec 2 integration
 * v1.1.3: Guard against possible nil values for the redirect_to url and the referrers

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/lib/ajax/action_controller.rb

@@ -39,7 +39,7 @@ module Ajax
       # layout and render that.  If it can't be found, the default layout
       # is used.
       def ajax_layout(template_name)
-        write_inheritable_attribute(:ajax_layout, template_name)
+        (self.is_a?(Class) ? self : self.class).write_inheritable_attribute(:ajax_layout, template_name)
       end
     end
 
@@ -103,9 +103,11 @@ module Ajax
 
           default = pick_layout(options)
           default = default.path_without_format_and_extension unless default.nil?
-          ajax_layout = _layout_for_ajax(default)
-          ajax_layout = ajax_layout.path_without_format_and_extension unless ajax_layout.nil?
-          options[:layout] = ajax_layout unless ajax_layout.nil?
+          if ajax_layout = _layout_for_ajax(default)
+            if ajax_layout = _find_ajax_layout(ajax_layout)
+              options[:layout] = ajax_layout.path_without_format_and_extension
+            end
+          end
         end
         render_without_ajax(options, extra_options, &block)
       end
@@ -121,18 +123,14 @@ module Ajax
         end
       end
 
-      # 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
+
+      def _layout_for_option(name)
+        default = super
+        if !request.xhr? || !Ajax.is_enabled?
+          default
         else
-          layout_name = super
-          if ajax_layout = _layout_for_ajax(layout_name)
-            ajax_layout.virtual_path
-          else
-            layout_name
-          end
+          ajax_layout = _layout_for_ajax(default)
+          ajax_layout && template_exists?(ajax_layout) ? ajax_layout : default
         end
       end
     end
@@ -147,8 +145,17 @@ module Ajax
     #
     # +controller+ is the result of calling ActionController#controller_name, so
     # if your controller is ApplicationController the value will be <tt>'application'</tt>.
+    #
+    # +layout+ is the name of the layout without any path or extension.  So for example if
+    # layouts/simple.html.erb or layouts/ajax/simple.html.erb are rendered the
+    # value of +layout+ would be <tt>'simple'</tt> in both cases.
     def serialize_ajax_info
-      Ajax.set_header(response, :layout, Ajax.app.rails?(3) ? _layout : active_layout)
+      layout_name = if Ajax.app.rails?(3)
+          @_rendered_layout && @_rendered_layout.variable_name
+        else
+          active_layout
+        end
+      Ajax.set_header(response, :layout, layout_name)
       Ajax.set_header(response, :controller, self.class.controller_name)
       response.headers['Ajax-Info'] = Ajax.send(:serialize_hash, response.headers['Ajax-Info'])
     end
@@ -245,15 +252,26 @@ END
       ajax_layout = if ajax_layout.nil? && default.nil?
           nil
         elsif ajax_layout.nil? && !default.nil? # look for one with the default name in layouts/ajax
-          "layouts/ajax/#{default.sub(/layouts(\/)?/, '')}"
-        elsif ajax_layout && !(ajax_layout =~ /^layouts\/ajax/) # look for it in layouts/ajax
-          "layouts/ajax/#{ajax_layout}"
-        else # look as is
+          if default =~ /^layouts\/ajax\//
+            default
+          elsif !(default =~ /^ajax\//)
+            "ajax/#{default.sub(/layouts(\/)?/, '')}"
+          else
+            default
+          end
+        elsif ajax_layout.include?(?/) # path to specific layout
           ajax_layout
+        else # layout name, look in ajax/
+          "ajax/#{ajax_layout}"
         end
+      ajax_layout = ajax_layout =~ /\blayouts/ ? ajax_layout : "layouts/#{ajax_layout}" if ajax_layout
+      ajax_layout
+    end
+
+    def _find_ajax_layout(ajax_layout)
       Ajax.app.rails?(3) ? find_template(ajax_layout) : find_layout(ajax_layout, 'html') if !ajax_layout.nil?
     rescue ::ActionView::MissingTemplate
-      Ajax.logger.info("[ajax] no layout found in layouts/ajax.  Using #{default}.")
+      Ajax.logger.warn("[ajax] layout #{ajax_layout.inspect} not found.  Using default.")
       nil
     end
   end

data/lib/ajax/railtie.rb

@@ -10,6 +10,16 @@ module Ajax
     initializer 'ajax.action_integration' do
       ActiveSupport.on_load :action_view do
         include Ajax::ActionView
+
+        self.class_eval do
+          unless instance_methods.include?('_render_layout_with_tracking')
+            def _render_layout_with_tracking(layout, locals, &block)
+              controller.instance_variable_set(:@_rendered_layout, layout)
+              _render_layout_without_tracking(layout, locals, &block)
+            end
+            alias_method_chain :_render_layout, :tracking
+          end
+        end
       end
       ActiveSupport.on_load :action_controller do
         include Ajax::ActionController
@@ -28,4 +38,4 @@ module Ajax
       Ajax.logger = ::Rails.logger
     end
   end
-end
+end

data/public/javascripts/ajax.js

@@ -682,10 +682,12 @@ var Ajax = function(options) {
    */
   self.hideLoadingImage = function() {
     // check if a new request has already started
-    if (self.current_request && self.current_request.status == 0) {
-      console.log("[ajax] aborting hideLoadingImage.. ");
-      return;
-    }
+    try {
+      if (self.current_request && self.current_request.status == 0) {
+        console.log("[AJAX] aborting hideLoadingImage.. ");
+        return;
+      }
+    } catch(e) {}
     if (!self.show_loading_image) { return; }
     if (!self.hide_loading_image_callback) {
       $(document).unbind('mousemove', self.updateImagePosition);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ajax
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Karl Varga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -07:00
+date: 2011-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency