ajax_pagination 0.6.0 → 0.6.1

data/.gitignore

@@ -1,6 +1,6 @@
 *.gem
 .bundle
-Gemfile.lock
+/Gemfile.lock
 pkg/*
 *~
 *.swp

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.6.1
+* the ajaxp:done event now sends an extra argument - the ajax_loadzone DOM element. This makes it easier for the event handler to make animations involving the loadzone. If it does not exist, null is returned.
+* one set of internally used data-pagination attributes has been renamed to data-ajax_section_id.
+* the ?pagination= querystring parameter has been renamed to ajax_section.
+* Fixed Travis CI tests to start up WEBrick servers with the correct rails version.
+
 ## v0.6.0
 The :pagination option no longer makes as much sense, now that the sections are called ajax_section. Also, this gem is as much about site navigation as pagination. This is the reason for some of the following changes.
 

data/Rakefile

@@ -20,11 +20,12 @@ task :travis do
   system("cp `bundle show jquery-rails`/vendor/assets/javascripts/* spec/rails30_app/public/javascripts/")
   system("cp `bundle show jquery-historyjs`/vendor/assets/javascripts/* spec/rails30_app/public/javascripts/")
   system("(cd spec/rails30_app/ && bundle exec rails generate ajax_pagination:assets --force)")
-
-  # startup test servers
-  system("(cd spec/rails_app/ && RAILS_ENV=test bundle exec rails server -d --port=#{serverport})") # daemonized rails server
-  system("(cd spec/rails_app/ && RAILS_ENV=test AJAX_DELAY=1.5 bundle exec rails server -d --port=#{serverslowport})") # daemonized rails server
-  system("(cd spec/rails30_app/ && RAILS_ENV=test AJAX_DELAY=1.5 bundle exec rails server -d --port=#{r30serverport})") # daemonized rails server
+  Bundler.with_clean_env do
+    # startup test servers
+    system("(export BUNDLE_GEMFILE=`pwd`/spec/rails_app/Gemfile; cd spec/rails_app/ && (bundle | grep -e 'Your bundle .*$') && RAILS_ENV=test bundle exec rails server -d --port=#{serverport})") # daemonized rails server
+    system("(export BUNDLE_GEMFILE=`pwd`/spec/rails_app/Gemfile; cd spec/rails_app/ && (bundle | grep -e 'Your bundle .*$') && RAILS_ENV=test AJAX_DELAY=1.5 bundle exec rails server -d --port=#{serverslowport})") # daemonized rails server
+    system("(export BUNDLE_GEMFILE=`pwd`/spec/rails30_app/Gemfile; cd spec/rails30_app/ && (bundle | grep -e 'Your bundle .*$') && RAILS_ENV=test AJAX_DELAY=1.5 bundle exec rails server -d --port=#{r30serverport})") # daemonized rails server
+  end
   system("bundle exec rake spec")
   unless $?.exitstatus == 0
     system("kill -9 `lsof -i :#{serverport} -t`") # kills rails server

data/lib/ajax_pagination/controller_additions.rb

@@ -7,9 +7,6 @@ module AjaxPagination
       # [:+section_id+]
       #   The AJAX section name which should be matched to invoke AJAX Pagination response. Defaults to "global".
       #
-      # [:+pagination+]
-      #   Deprecated. Alias for section_id.
-      #
       # [:+render+]
       #   Overrides default render behaviour for AJAX Pagination, which is to render the partial with name matching the section_id option,
       #   or if it does not exist, renders the default template
@@ -17,12 +14,12 @@ module AjaxPagination
       def ajax_respond(options = {});
         # instead of defining default render normally, we save an unbound reference to original function in case it was already defined, since we want to retain the original behaviour, and add to it (if the method is redefined after, this new behaviour is lost, but at least we don't remove others' behaviour - note that this also allows multiple invocations of this with different parameters)
         default_render = self.instance_method(:default_render) # get a reference to original method
-        section_id = options[:section_id] || options[:pagination] || "global"
+        section_id = options[:section_id] || "global"
         view = options[:render] || nil
         define_method(:default_render) do |*args|
           if ajax_section && ajax_section == section_id && request.format == "html" # override if calling AJAX Pagination
             unless view
-              if lookup_context.find_all("#{params[:controller]}/_#{ajax_section}").any?
+              if lookup_context.find_all(controller_path + "/_" + ajax_section).any?
                 view = { :partial => ajax_section } # render partial, layout is off
               else
                 view = { :layout => false } # render default view, but turn off layout
@@ -45,8 +42,11 @@ module AjaxPagination
       end
 
       base.before_filter do
-        @_ajax_section = request.GET[:pagination] || params[:pagination]
-        params.delete(:pagination) if request.get?
+        # simply manipulating querystring will not get ajax response (in production mode)
+        if request.xhr? || Rails.env == 'development'
+          @_ajax_section = request.GET[:ajax_section] || params[:ajax_section]
+          params.delete(:ajax_section) if request.get?
+        end
       end
     end
 
@@ -77,9 +77,6 @@ module AjaxPagination
     #   Changes the AJAX section name triggering this response. Triggered when ajax_section == options [:section_id].
     #   Defaults to "global"
     #
-    # [:+pagination+]
-    #   Deprecated. Alias for section_id
-    #
     # [:+render+]
     #   Changes the default template/partial that is rendered by this response. The value can be any object,
     #   and is rendered directly. The render behaviour is the same as the render method in controllers. If this option is not used,
@@ -95,11 +92,11 @@ module AjaxPagination
     #     end
     #
     def ajax_respond(format,options = {})
-      if ajax_section == (options[:section_id] || options[:pagination] || 'global').to_s
+      if ajax_section == (options[:section_id] || 'global').to_s
         if options[:render]
           view = options[:render] # render non partial
-        elsif lookup_context.find_all(params[:controller] + "/_" + ajax_section).any?
-          view = {:partial => ajax_section} # render partial of the same name as pagination
+        elsif lookup_context.find_all(controller_path + "/_" + ajax_section).any?
+          view = {:partial => ajax_section} # render partial of the same name as section_id
         else # render usual view
           view = {}
         end
@@ -162,7 +159,7 @@ module AjaxPagination
     # This filter should not affect other uses, because only AJAX calls trigger this. In addition, a ?pagination= parameter is required.
     # Therefore other AJAX libraries or usage otherwise should not be affected.
     def ajax_pagination_redirect
-      if request.xhr? && ajax_section && response.status==302 # alter redirect response so that it can be detected by the client javascript
+      if ajax_section && response.status==302 # alter redirect response so that it can be detected by the client javascript
         response.status = 200 # change response to OK, location header is preserved, so AJAX can get the new page manually
       end
     end

data/lib/ajax_pagination/helper_additions.rb

@@ -33,12 +33,9 @@ module AjaxPagination
     # Options:
     # [:+id+]
     #   Changes the AJAX section name, which is used for requesting new content, and to uniquely identify the
-    #   wrapping div tag. The name passed here should be the same as the pagination name used in the controller
+    #   wrapping div tag. This section id will be referred to in the controller
     #   respond_to block. Defaults to "global".
     #
-    # [:+pagination+]
-    #   Deprecated. Alias for name.
-    #
     # [:+render+]
     #   Changes the partial which is rendered. Defaults to +options [:name]+. The partial should generally
     #   be the same as that given in the controller respond_to block, unless you are doing something strange. If a
@@ -86,9 +83,9 @@ module AjaxPagination
     #   the link simply creates a cool AJAX effect on the current page.
     #
     def ajax_section(options = {})
-      section_id = options[:id] || options[:pagination] || 'global' # by default the name of the section is 'global'
+      section_id = options[:id] || 'global' # by default the name of the section is 'global'
       partial = options[:render] || section_id # default partial rendered is the name of the section
-      divoptions = { :id => "#{section_id}", :class => "paginated_section" }
+      divoptions = { :id => "#{section_id}", :class => "ajax_section" }
       data = {};
       if options.has_key? :history
         data[:history] = (options[:history] != false)
@@ -100,7 +97,7 @@ module AjaxPagination
       data[:image] = asset_path options[:image] if options[:image].class.to_s == "String"
       divoptions["data-pagination"] = data.to_json if !data.empty?
       if options[:loadzone]
-        divoptions[:class] = "paginated_section paginated_content"
+        divoptions[:class] = "ajax_section ajax_loadzone"
         divoptions[:style] = "position: relative;"
       end
       content_tag :div, divoptions do
@@ -130,7 +127,7 @@ module AjaxPagination
     #   <% end %>
     #
     def ajax_loadzone()
-      content_tag :div, :class => "paginated_content", :style => "position: relative;" do
+      content_tag :div, :class => "ajax_loadzone", :style => "position: relative;" do
         yield
       end
     end
@@ -150,7 +147,7 @@ module AjaxPagination
     #
     def ajax_links(options = {})
       section_id = options[:section_id] || 'global'
-      content_tag :div, "data-pagination" => section_id, :class => ((Array(options[:class]) || []) + ["ajaxpagination"]).join(" ") do
+      content_tag :div, "data-ajax_section_id" => section_id, :class => ((Array(options[:class]) || []) + ["ajaxpagination"]).join(" ") do
         yield
       end
     end
@@ -167,7 +164,7 @@ module AjaxPagination
     #   <%= link_to "Name", posts_url, ajax_options :section_id => "page" %>
     #
     def ajax_options(html_options = {})
-      html_options["data-pagination".to_sym] = html_options.delete(:section_id) || html_options.delete("data-section_id") || html_options.delete(:pagination) || html_options.delete("data-pagination") || "global" # renames the option pagination to data-pagination
+      html_options["data-ajax_section_id".to_sym] = html_options.delete(:section_id) || "global" # renames the option section_id to data-ajax_section_id
       html_options[:remote] = true
       html_options["data-type".to_sym] ||= html_options.delete("data-type") || 'html'
       html_options

data/lib/ajax_pagination/version.rb

@@ -1,3 +1,3 @@
 module AjaxPagination
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/assets/javascripts/ajax_pagination.js.erb

@@ -2,7 +2,7 @@
 //= require jquery.url
 
 /* 
- * AJAX Pagination: Ajaxifying your navigation
+ * AJAX Pagination v<%= AjaxPagination::VERSION %>: Ajaxifying your navigation
  * https://github.com/ronalchn/ajax_pagination
  * 
  * Copyright (c) 2012 Ronald Ping Man Chan
@@ -44,19 +44,19 @@ jQuery(document).ready(function () {
       ////// $.ajax_pagination API //////
       ///////////////////////////////////
       // selector function for pagination object
-      $.ajax_pagination = function (pagination_name) {
-        return new pagination_object(pagination_name);
+      $.ajax_pagination = function (section_id) {
+        return new ajax_section_object(section_id);
       };
       $.ajax_pagination.version = '<%= AjaxPagination::VERSION %>';
       $.ajax_pagination.enabled = true;
-      function pagination_object(pagination_name) {
+      function ajax_section_object(section_id) {
         this.get = function(url,options) {
           if (options === undefined) options = {};
           if (options.history === undefined) options.history = true;
-          swapPage(pagination_name,url,options.history);
+          swapPage(section_id,url,options.history);
         }
         this.exists = function() {
-          return $('#' + pagination_name).length == 1;
+          return $('#' + section_id).length == 1;
         }
       }
       /////////////////////////////
@@ -66,42 +66,44 @@ jQuery(document).ready(function () {
       var pagination_url = location.href; // url we came from, so we can see transitions of the url
       var history_state = {ajax_pagination_set:true}; // current history state
 
-      function display_pagination_loader(pagination_name) {
-        var paginated_section = getSection(pagination_name);
-        if (pagination_loader_state[pagination_name] === undefined) { // show loader if not already shown
-          if ($.rails.fire(getSection(pagination_name),"ajaxp:loading")) {
-            var paginated_content;
-            if (paginated_section.hasClass("paginated_content")) paginated_content = paginated_section; // if the whole section is a loading zone
-            else paginated_content = paginated_section.children(".paginated_content").first(); // don't want to support multiple loader images
-            var height = paginated_content.height();
+      function display_pagination_loader(section_id) {
+        var ajax_section = getSection(section_id);
+        if (pagination_loader_state[section_id] === undefined) { // show loader if not already shown
+          // get the ajax_loadzone DOM element
+          var ajax_loadzone;
+          if (ajax_section.hasClass("ajax_loadzone")) ajax_loadzone = ajax_section; // if the whole section is a loading zone
+          else ajax_loadzone = ajax_section.children(".ajax_loadzone").first(); // don't want to support multiple loader images
+
+          if ($.rails.fire(getSection(section_id),"ajaxp:loading",[ajax_loadzone.get(0)])) {
+            var height = ajax_loadzone.height();
             // setup loading look
             var img = document.createElement("IMG");
-            if (paginated_section.data("pagination") !== undefined && paginated_section.data("pagination").image !== undefined) img.src = paginated_section.data("pagination").image;
+            if (ajax_section.data("pagination") !== undefined && ajax_section.data("pagination").image !== undefined) img.src = ajax_section.data("pagination").image;
             else img.src = "<%= asset_path AjaxPagination.loading_image %>";
             var margin = Math.round(height>400?50:(height/8));
             $(img).addClass('ajaxpagination-loader');
             var div = document.createElement("DIV");
             $(div).addClass('ajaxpagination-loadzone');
             $(div).append("<div class=\"margin-top\" />").append(img);
-            paginated_content.wrapInner("<div class=\"ajaxpagination-oldcontent\" />");
-            paginated_content.append(div);
+            ajax_loadzone.wrapInner("<div class=\"ajaxpagination-oldcontent\" />");
+            ajax_loadzone.append(div);
           }
         }
-        if ($.rails.fire(getSection(pagination_name),"ajaxp:focus")) {
-          // scroll to top of paginated_section if it is not visible
-          if ($(document).scrollTop() > paginated_section.offset().top - <%= AjaxPagination.scroll_margin %>) {
-            $(document).scrollTop(paginated_section.offset().top - <%= AjaxPagination.scroll_margin %>);
+        if ($.rails.fire(getSection(section_id),"ajaxp:focus")) {
+          // scroll to top of ajax_section if it is not visible
+          if ($(document).scrollTop() > ajax_section.offset().top - <%= AjaxPagination.scroll_margin %>) {
+            $(document).scrollTop(ajax_section.offset().top - <%= AjaxPagination.scroll_margin %>);
           }
         }
       }
-      function getSection(pagination_name) {
-        var id = "#" + pagination_name; // element id we are looking for
+      function getSection(section_id) {
+        var id = "#" + section_id; // element id we are looking for
         return $(id);
       }
       function getSectionName(section) {
           var id = section.attr("id");
           if (id === undefined) return undefined; // no name
-          return id; // id = pagination_name
+          return id; // id = section_id
       }
       function getSectionNames(sections) {
         var names = new Array();
@@ -120,9 +122,9 @@ jQuery(document).ready(function () {
         return false; // doesn't intersect
       }
       // whether change of state is a reload
-      function isReload(pagination_name,from,to) {
+      function isReload(section_id,from,to) {
         if (from == to) return true; // same url - always a reload
-        var section = getSection(pagination_name);
+        var section = getSection(section_id);
         if (section.length == 0) return false;
 
         // if data-pagination is not defined, then no reload can be detected
@@ -154,25 +156,25 @@ jQuery(document).ready(function () {
       }
       // when this function is used beforeSend of an AJAX request, will use the resulting content in a section of the page
       // this event handler has the same arguments as for jquery and jquery-ujs, except it also takes the name of the section to put the content into as first argument
-      // adapter functions will be used to reconcile the differences in arguments, this is required because jquery and jquery-ujs has different ways to get the pagination_name argument
-      function beforeSendHandler(pagination_name,jqXHR,settings) {
-        var id = "#" + pagination_name; // element id we are looking for
+      // adapter functions will be used to reconcile the differences in arguments, this is required because jquery and jquery-ujs has different ways to get the section_id argument
+      function beforeSendHandler(section_id,jqXHR,settings) {
+        var id = "#" + section_id; // element id we are looking for
         var requesturl = settings.url;
-        var countid = $('[id="' + pagination_name + '"]').length;
+        var countid = $('[id="' + section_id + '"]').length;
         if (countid != 1) { // something wrong, cannot find unique section to load page into
           <% if AjaxPagination.warnings %>
-            alert("AJAX Pagination UNIQUE_SECTION_NOT_FOUND:\nExpected one pagination section called " + pagination_name + ", found " + countid);
+            alert("AJAX Pagination UNIQUE_SECTION_NOT_FOUND:\nExpected one section with id of " + section_id + ", found " + countid);
           <% end %>
           return false; // continue AJAX normally
         }
-        if (!$.rails.fire(getSection(pagination_name),"ajaxp:beforeSend",[jqXHR,settings])) return false;
-        display_pagination_loader(pagination_name);
+        if (!$.rails.fire(getSection(section_id),"ajaxp:beforeSend",[jqXHR,settings])) return false;
+        display_pagination_loader(section_id);
         // register callbacks for other events
         jqXHR.done(function(data, textStatus, jqXHR) {
-          if (requesturl != pagination_loader_state[pagination_name]) return; // ignore stale content
+          if (requesturl != pagination_loader_state[section_id]) return; // ignore stale content
           if (jqXHR.status == 200 && jqXHR.getResponseHeader('Location') !== null) { // special AJAX redirect
             var redirecturl = jqXHR.getResponseHeader('Location');
-            swapPage(pagination_name,redirecturl);
+            swapPage(section_id,redirecturl);
             pagination_url = redirecturl;
             History.replaceState(history_state,document.title,redirecturl); // state not changed
             return;
@@ -190,7 +192,7 @@ jQuery(document).ready(function () {
           if (content.length>0) {
             content = content.html();
             <% if AjaxPagination.warnings %>
-              alert("AJAX Pagination EXTRA_CONTENT_DISCARDED:\nExtra content returned by AJAX request ignored. Only a portion of the page content returned by the server was required. To fix this, explicitly call ajax_respond :pagination => \"" + pagination_name + "\" to render only the partial view required. This warning can be turned off in the ajax_pagination initializer file.");
+              alert("AJAX Pagination EXTRA_CONTENT_DISCARDED:\nExtra content returned by AJAX request ignored. Only a portion of the page content returned by the server was required. To fix this, explicitly call ajax_respond :section_id => \"" + section_id + "\" to render only the partial view required. This warning can be turned off in the ajax_pagination initializer file.");
             <% end %>
           }
           else { // otherwise use all the content, including any scripts - we consider scripts specifically returned in the partial probably should be re-run
@@ -199,76 +201,67 @@ jQuery(document).ready(function () {
             else content = page.html(); // otherwise include the whole html snippet
           }
 
-          if ($.rails.fire(getSection(pagination_name),"ajaxp:done",[content])) $(id).html(content);
+          if ($.rails.fire(getSection(section_id),"ajaxp:done",[content])) $(id).html(content);
 
-          delete pagination_loader_state[pagination_name]; // not waiting for page anymore
+          delete pagination_loader_state[section_id]; // not waiting for page anymore
 
-          $.rails.fire(getSection(pagination_name),"ajaxp:loaded");
+          $.rails.fire(getSection(section_id),"ajaxp:loaded");
         });
         jqXHR.fail(function(jqXHR, textStatus, errorThrown) {
-          if (requesturl != pagination_loader_state[pagination_name]) return; // ignore stale content
-          if ($.rails.fire(getSection(pagination_name),"ajaxp:fail",[jqXHR.responseText])) $(id).html(jqXHR.responseText);
+          if (requesturl != pagination_loader_state[section_id]) return; // ignore stale content
+          if ($.rails.fire(getSection(section_id),"ajaxp:fail",[jqXHR.responseText])) $(id).html(jqXHR.responseText);
 
-          delete pagination_loader_state[pagination_name]; // not waiting for page anymore
+          delete pagination_loader_state[section_id]; // not waiting for page anymore
 
-          $.rails.fire(getSection(pagination_name),"ajaxp:loaded");
+          $.rails.fire(getSection(section_id),"ajaxp:loaded");
         });
         return true;
       }
-      function swapPage(pagination_name, requesturl, history) { // swaps the page at pagination_name to that from requesturl (used by History.popState, therefore no remote link has been clicked)
+      function swapPage(section_id, requesturl, history) { // swaps the page at section_id to that from requesturl (used by History.popState, therefore no remote link has been clicked)
         if (history === undefined) history = false;
         // send our own ajax request, and tie it into the beforeSendHandler used for jquery-ujs as well
-        if (!$.rails.fire(getSection(pagination_name),"ajaxp:before",[requesturl,undefined])) return false;
-        $.ajax({url: requesturl, data: {pagination:pagination_name},
+        if (!$.rails.fire(getSection(section_id),"ajaxp:before",[requesturl,undefined])) return false;
+        $.ajax({url: requesturl, data: {ajax_section:section_id},
           dataType: 'html',
           beforeSend: function (jqXHR,settings) {
-            var result = beforeSendHandler(pagination_name,jqXHR,settings);
+            var result = beforeSendHandler(section_id,jqXHR,settings);
             if (result) {
-              if (history) pushHistory(pagination_name,settings.url);
-              pagination_loader_state[pagination_name] = settings.url; // remember which page number we are waiting for
+              if (history) pushHistory(section_id,settings.url);
+              pagination_loader_state[section_id] = settings.url; // remember which page number we are waiting for
             }
             return result;
           }
         });
       }
-      function pushHistory(pagination_name,url) {
-        var data = $("#" + pagination_name).data("pagination");
+      function pushHistory(section_id,url) {
+        var data = $("#" + section_id).data("pagination");
         if (data === undefined || data.history === undefined || data.history) { // check that history is not disabled
           // construct visible url
           var data = $.deparam.querystring($.url(url).attr('query'));
-          delete data['pagination'];
+          delete data['ajax_section'];
           pagination_url = $.param.querystring(url,data,2);
-          if (isReload(pagination_name,url,location.href)) History.replaceState(history_state,document.title,pagination_url);
+          if (isReload(section_id,url,location.href)) History.replaceState(history_state,document.title,pagination_url);
           else { // not just a reload of current page, so do actual pushState
             // change current history state, and push it on
             if (history_state.ajax_pagination === undefined) history_state.ajax_pagination = new Array();
-            var fieldname = "_" + pagination_name;
+            var fieldname = "_" + section_id;
             if (history_state.ajax_pagination[fieldname] === undefined) history_state.ajax_pagination[fieldname]=1;
             else history_state.ajax_pagination[fieldname]++;
             History.pushState(history_state,document.title,pagination_url); // push state
           }
         }
       }
-      // these special containers are for convenience only, to apply the required data-remote, data-pagination attributes to all links inside
+      // these special containers are for convenience only, to apply the required data-remote, data-ajax_section_id attributes to all links inside
       $(document).on("click", ".ajaxpagination a", function(e) {
         // ignore if already selected by jquery-ujs
         if ($(this).filter($.rails.linkClickSelector).length>0) return true; // continue with jquery-ujs - this behaviour is necessary because we do not know if the jquery-ujs handler executes before or after this handler
-        // find out what data-pagination should be set to
+        // find out what data-ajax_section_id should be set to
         var pagination_container = $(this).closest(".ajaxpagination"); // container of links (use to check for data-pagination first)
-        var pagination_name = pagination_container.data('pagination');
-        if (pagination_name === undefined) {
-          pagination_name = $(this).closest(".paginated_section").attr("id"); // if data-pagination not present, search up the tree for a suitable section
-          if (pagination_name == null) {
-            <% if AjaxPagination.warnings %>
-              alert("AJAX Pagination MISSING_REFERENCE:\nNo pagination section id given for link, and none could be implicitly assigned, AJAX cancelled for this request");
-            <% end %>
-            return true; // pagination not set up properly
-          }
-        }
+        var section_id = pagination_container.data('ajax_section_id');
         
-        // set data-remote, data-pagination
+        // set data-remote, data-ajax_section_id
         $(this).attr({'data-remote':'true'}); // needs to be set so that the jquery-ujs selectors work
-        $(this).data({'remote':'true','pagination':pagination_name}); // needs to be set because attributes only read into jquery's data memory once
+        $(this).data({'remote':'true','ajax_section_id':section_id}); // needs to be set because attributes only read into jquery's data memory once
         if ($(this).data('type') === undefined) { // to be moved to ajax:before filter when https://github.com/rails/jquery-ujs/pull/241 is successful, and jquery-rails minimum version updated
           $(this).data('type','html'); // AJAX Pagination requests return html be default
         }
@@ -280,24 +273,24 @@ jQuery(document).ready(function () {
         return false;
       });
       $(document).on("ajax:before","a, " + $.rails.inputChangeSelector, function() {
-        var pagination_name = $(this).data('pagination');
-        if (pagination_name === undefined) return true; // this is not an AJAX Pagination AJAX request
-        $(this).data('params',$.extend($(this).data('params'),{'pagination':pagination_name})); // add data-pagination to the params data
-        return $.rails.fire(getSection(pagination_name),"ajaxp:before",[this.href,$(this).data('method')]);
+        var section_id = $(this).data('ajax_section_id');
+        if (section_id === undefined) return true; // this is not an AJAX Pagination AJAX request
+        $(this).data('params',$.extend($(this).data('params'),{'ajax_section':section_id})); // add data-pagination to the params data
+        return $.rails.fire(getSection(section_id),"ajaxp:before",[this.href,$(this).data('method')]);
       });
       $(document).on("ajax:before","form", function() {
-        var pagination_name = $(this).data('pagination');
-        if (pagination_name === undefined) return true; // this is not an AJAX Pagination AJAX request
+        var section_id = $(this).data('ajax_section_id');
+        if (section_id === undefined) return true; // this is not an AJAX Pagination AJAX request
         // alter action to include pagination parameter in the GET part of the action url
-        $(this).attr('action',$.param.querystring($(this).attr('action'),{pagination:pagination_name}));
-        return $.rails.fire(getSection(pagination_name),"ajaxp:before",[$(this).attr('action'),$(this).data('method')]);
+        $(this).attr('action',$.param.querystring($(this).attr('action'),{ajax_section:section_id}));
+        return $.rails.fire(getSection(section_id),"ajaxp:before",[$(this).attr('action'),$(this).data('method')]);
       });
       $(document).on("ajax:beforeSend","a, form, " + $.rails.inputChangeSelector, function (e,jqXHR,settings) {
-        var pagination_name = $(this).data('pagination');
-        if (pagination_name === undefined) return true; // this is not an AJAX Pagination AJAX request
-        if (beforeSendHandler(pagination_name,jqXHR,settings)) {
-          pushHistory(pagination_name,settings.url);
-          pagination_loader_state[pagination_name] = settings.url;
+        var section_id = $(this).data('ajax_section_id');
+        if (section_id === undefined) return true; // this is not an AJAX Pagination AJAX request
+        if (beforeSendHandler(section_id,jqXHR,settings)) {
+          pushHistory(section_id,settings.url);
+          pagination_loader_state[section_id] = settings.url;
         }
         return true;
       });
@@ -332,11 +325,11 @@ jQuery(document).ready(function () {
         }
         history_state = state; // we can update our view of the state now
 
-        changedsections.sort(); // sort the pagination_names stored in array
+        changedsections.sort(); // sort the section_ids stored in array
         for (var i = 0; i < changedsections.length; i++) {
           var section = getSection(changedsections[i]);
           if (section.length == 0) continue; // no longer exists on page (meaning it does not need reloading)
-          var parentsections = getSectionNames(section.parents(".paginated_section"));
+          var parentsections = getSectionNames(section.parents(".ajax_section"));
           parentsections.sort();
           // check for intersection
           if (!intersects(changedsections,parentsections)) { // no intersection, load new content in this section
@@ -350,21 +343,21 @@ jQuery(document).ready(function () {
       History.Adapter.trigger(window,"popstate"); // update stuff on page load
 
       // trigger a loaded event on each section on initial page load
-      $.rails.fire($(".paginated_section"),"ajaxp:loaded");
+      $.rails.fire($(".ajax_section"),"ajaxp:loaded");
     }
     else {
       // AJAX Pagination is disabled, we need to tidy up a few things to keep things working
 
       // remove remote attribute globally
-      $("a[data-pagination]").removeData('remote');
-      $("a[data-pagination]").removeAttr('data-remote');
-      $("form[data-pagination]").removeData('remote');
-      $("form[data-pagination]").removeAttr('data-remote');
+      $("a[data-ajax_section_id]").removeData('remote');
+      $("a[data-ajax_section_id]").removeAttr('data-remote');
+      $("form[data-ajax_section_id]").removeData('remote');
+      $("form[data-ajax_section_id]").removeAttr('data-remote');
 
       // set an event handler to remove the remote attribute if new content is loaded with AJAX Pagination
-      $(document).children().add(".paginated_section").delegate("a, input, form","click.rails change.rails submit.rails", function(event) {
+      $(document).children().add(".ajax_section").delegate("a, input, form","click.rails change.rails submit.rails", function(event) {
         var element = $(event.target);
-        if (element.data('pagination') === undefined) return true;
+        if (element.data('ajax_section_id') === undefined) return true;
         else {
           element.removeData('remote');
           element.removeAttr('data-remote');