alphabetical_paginate 1.6.1 → 2.0.0

data/README.md

@@ -8,7 +8,7 @@ AlphabeticalPaginate incorporates efficient javascript partial page rerendering
 
 It has two modes - if you're working with MySQL, it allows for low level database regex queries. Otherwise, it uses a buffered search to build an array. You should be able to easily modify the gem to work with other SQL databases (please make a pull-request if you do!).
 
-We also now have Russian language support.
+We also now have Russian language support and Bootstrap 3 support.
 
 Some code was inspired by [will_paginate](https://github.com/mislav/will_paginate).
 
@@ -111,6 +111,7 @@ Key | Value | Default |Description
 `:pagination_class` | `String` | `"pagination-centered"` | All the classes you would like to add to the rendered pagination selector div (for CSS purposes).
 `:js` | `Boolean` | `"true"` | If you want the javascript with page-rerendering to be enabled.
 `:support_language` | `Symbol` | `:en` | If you want russian letters support set this value to `:ru` (only if `I18n.locale` in your application set to `:ru`).
+`:bootstrap3` | `Boolean` | `false` | If you want to enable bootstrap 3 support
 
 ## Advanced Pagination
 

data/lib/alphabetical_paginate/array.rb

@@ -3,7 +3,7 @@ class Array
   def alpha_paginate current_field, params = {enumerate:false, default_field: "a", 
                                               paginate_all: false, numbers: true, include_all: true,
                                               others: true, pagination_class: "pagination-centered",
-                                              js: true, support_language: :en}
+                                              js: true, support_language: :en, bootstrap3: false}
     params[:paginate_all] ||= false
     params[:support_language] ||= :en
     params[:language] = AlphabeticalPaginate::Language.new(params[:support_language])

data/lib/alphabetical_paginate/controller_helper.rb

@@ -9,7 +9,8 @@ module AlphabeticalPaginate
                                                 others: true, pagination_class: "pagination-centered",
                                                 batch_size: 500, db_mode: false, 
                                                 db_field: "id", include_all: true,
-                                                js: true, support_language: :en}
+                                                js: true, support_language: :en,
+                                                bootstrap3: false}
       params[:paginate_all] ||= false
       params[:support_language] ||= :en
       params[:language] = AlphabeticalPaginate::Language.new(params[:support_language])

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "1.6.1"
+  VERSION = "2.0.0"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -46,15 +46,16 @@ module AlphabeticalPaginate
       end
       
 
+      element = params[:bootstrap3] ? 'ul' : 'div'
       if params[:pagination_class] != "none"
-        pagination = '<div class="pagination %s" id="alpha" style="height:35px;">' % params[:pagination_class]
+        pagination = '<#{element} class="pagination %s alpha" style="height:35px;">' % params[:pagination_class]
       else
-        pagination = '<div class="pagination" id="alpha" style="height:35px;">'
+        pagination = '<#{element} class="pagination alpha" style="height:35px;">'
       end
       pagination +=
-        "<ul>" +
+        params[:bootstrap3] ? "" : "<ul>" +
         links +
-        "</ul>" +
+        params[:bootstrap3] ? "" : "</ul>" +
         "</div>"
 
       output += pagination

data/vendor/assets/javascripts/alphabetical_paginate.js

@@ -5,30 +5,38 @@ $(function() {
   // RAILS 3.0 USERS -> Please delete the above line and uncomment the bottom line
   //var img = "<img src='/images/aloader.gif' class='loading'/>";
   
-  $(document).on("click", ".pagination#alpha a", function(e) {
-      var url = location.href,
-          letter = $(this).data("letter");
-      if (/letter/.test(url)){
-        url = url.replace(/letter=[^&]*/,"letter=" + letter);
-      }
+
+  var navbar = $(".pagination.alpha a");
+  // Pick the handler list: just a quick check for the jQuery version (see here: http://bugs.jquery.com/ticket/10589)
+  var handlers = navbar.data ? navbar.data('events').click : jQuery._data(navbar[0], 'events').click;
+
+  if (-1 !== $.inArray(onNavbarClick, handlers)) {
+      $(document).on("click", ".pagination.alpha a", onNavbarClick);
+  }
+
+  function onNavbarClick(e) {
+      e.preventDefault();
+      var url = location.href, 
+      letter = $(this).data("letter");
+      if (/letter/.test(url)) {
+          url = url.replace(/letter=[^&]*/, "letter=" + letter);
+      } 
       else {
-        if (/\?/.test(url)) {
-          url += "&letter=" + letter;
-        }
-        else {
-          url += "?letter=" + letter;
-        }
+          if (/\?/.test(url)) {
+              url += "&letter=" + letter;
+          } 
+          else {
+              url += "?letter=" + letter;
+          }
       }
       $(".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));
+          $("#pagination_table").html($("#pagination_table", result));
       });
       history.pushState(null, document.title, url);
-      e.preventDefault();
-  });
-
+  }
 
    // let navigate the browser throught the ajax history
   $(window).bind("popstate", function() {

metadata

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