alphabetical_paginate 0.2.13 → 0.2.16

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "0.2.13"
+  VERSION = "0.2.16"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -19,20 +19,22 @@ module AlphabeticalPaginate
           if l == params[:currentField]
             links += '<li class="active"><a href="#" data-letter="' + l + '">' + l + "</a></li>"
           elsif params[:availableLetters].include? l
-            links += '<li><a href="#" data-letter="' + l + '">' + l + "</a></li>"
+            links += '<li><a href="?letter=" data-letter="' + l + '">' + l + "</a></li>"
           else
-            links += '<li class="disabled"><a href="#" data-letter="' + l + '">' + l + "</a></li>"
+            links += '<li class="disabled"><a href="?letter=" data-letter="' + l + '">' + l + "</a></li>"
           end
         end
       else
+        params[:availableLetters].sort!
+        params[:availableLetters] = params[:availableLetters][1..-1] + ["*"] if params[:availableLetters][0] == "*"
         params[:availableLetters] -= (1..9).to_a.map{|x| x.to_s} if !params[:numbers]
         params[:availableLetters] -= ["*"] if !params[:others]
         
         params[:availableLetters].each do |l|
           if l == params[:currentField]
-            links += '<li class="active"><a href="#" data-letter="' + l + '">' + l + "</a></li>"
+            links += '<li class="active"><a href="?letter=" data-letter="' + l + '">' + l + "</a></li>"
           else
-            links += '<li><a href="#" data-letter="' + l + '">' + l + "</a></li>"
+            links += '<li><a href="?letter=' + l + '" data-letter="' + l + '">' + l + "</a></li>"
           end
         end
       end
@@ -45,9 +47,7 @@ module AlphabeticalPaginate
       end
       pagination +=
         "<ul>" +
-        "<li><a id='paginate-prev' href='#'>Prev</a></li>" +
         links +
-        "<li><a id='paginate-next' href='#'>Next</a></li>" +
         "</ul" +
         "</div>"
 

data/vendor/assets/javascripts/alphabetical_paginate.js

@@ -1,15 +1,18 @@
 $(function() {
-  var text = "<span class='loading'>Loading...</span>"
+    var img = "<img src='/images/loader.gif' class='loading'/>"
+    var text = "<span class='loading'>Page is loading...</span>"
 
-  $(".pagination a").live("click", function(e) {
-      jQuery.getScript(location.href.replace("(letter=?)", "letter=" + this.data("letter")));
-      jQuery(".pagination").html(text);
-      history.pushState(null, document.title, location.href.replace("(letter=?)", "letter=" + this.data("letter")));
-      e.preventDefault();
-  });
+    $(".pagination a").live("click", function(e) {
+        //jQuery.setFragment({ "page" : jQuery.queryString(this.href).page })
+        jQuery.getScript(this.href);
+        jQuery(".pagination").html(text+img);
+        history.pushState(null, document.title, this.href);
+        e.preventDefault();
+    });
+
+    $(window).bind("popstate", function() {
+        $.getScript(location.href);
+        $(".pagination").html(text+img);
+    });
 
-  $(window).bind("popstate", function() {
-      $.getScript(location.href);
-      $(".pagination").html(text);
-  });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphabetical_paginate
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -89,9 +89,7 @@ files:
 - Rakefile
 - alphabetical_paginate.gemspec
 - lib/alphabetical_paginate.rb
-- lib/alphabetical_paginate/.array.rb.swo
 - lib/alphabetical_paginate/.array.rb.swp
-- lib/alphabetical_paginate/.view_helpers.rb.swo
 - lib/alphabetical_paginate/.view_helpers.rb.swp
 - lib/alphabetical_paginate/array.rb
 - lib/alphabetical_paginate/engine.rb