alphabetical_paginate 2.1.0 → 2.2.0

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -17,7 +17,7 @@ module AlphabeticalPaginate
         elsif params[:numbers]
           range = ["0-9"] + range
         end
-        range.unshift "All" if params[:include_all]
+        range.unshift "All" if (params[:include_all] && !range.include? "All")
         range.each do |l|
           value = params[:language].output_letter(l)
           if l == params[:currentField]
@@ -31,7 +31,7 @@ module AlphabeticalPaginate
       else
         params[:availableLetters].sort!
         params[:availableLetters] = params[:availableLetters][1..-1] + ["*"] if params[:availableLetters][0] == "*"
-        params[:availableLetters].unshift "All" if params[:include_all]
+        params[:availableLetters].unshift "All" if (params[:include_all] && !params[:availableLetters].include? "All")
         params[:availableLetters] -= (1..9).to_a.map{|x| x.to_s} if !params[:numbers]
         params[:availableLetters] -= ["*"] if !params[:others]
         

data/vendor/assets/javascripts/alphabetical_paginate.js

@@ -32,8 +32,8 @@ $(function() {
       $(".pagination").html(img);
       //$.load(url + " #pagination_table");
       $.get(url, function(result) {
-          $(".pagination").html($(".pagination", result));
-          $("#pagination_table").html($("#pagination_table", result));
+          $(".pagination").html($(".pagination", result).html());
+          $("#pagination_table").html($("#pagination_table", result).html());
       });
       history.pushState(null, document.title, url);
   }
@@ -43,8 +43,8 @@ $(function() {
     if (once) {
       $(".pagination").html(img);
       $.get(location.href, function(result) {
-        $(".pagination").html($(".pagination", result));
-          $("#pagination_table").html($("#pagination_table", result));
+        $(".pagination").html($(".pagination", result).html());
+          $("#pagination_table").html($("#pagination_table", result).html());
         });
       } else {
         once = true;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphabetical_paginate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler