alphabetical_paginate 2.0.0 → 2.1.0

data/lib/alphabetical_paginate/controller_helper.rb

@@ -55,8 +55,6 @@ module AlphabeticalPaginate
             output = self.where("LOWER(%s) REGEXP '^[^a-z0-9].*'" % [params[:db_field], current_field])
           end
         end
-        #output.sort! {|x, y| x.send(params[:db_field]) <=> y.send(params[:db_field])}
-        output.order("#{params[:db_field]} ASC")
       else
         availableLetters = {}
         self.find_each({batch_size: params[:batch_size]}) do |x|
@@ -83,7 +81,7 @@ module AlphabeticalPaginate
         output.sort! {|x, y| block_given? ? (yield(x).to_s <=> yield(y).to_s) : (x.id.to_s <=> y.id.to_s) }
       end
       params[:currentField] = current_field.mb_chars.capitalize.to_s
-      return output, params
+      return ((params[:db_mode] && params[:db_field]) ? output.order("#{params[:db_field]} ASC") : output), params
     end
   end
 end

data/lib/alphabetical_paginate/version.rb

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

data/lib/alphabetical_paginate/view_helpers.rb

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

data/vendor/assets/javascripts/alphabetical_paginate.js

@@ -3,14 +3,14 @@ $(function() {
 
   var img = "<img src='/assets/aloader.gif' class='loading'/>";
   // RAILS 3.0 USERS -> Please delete the above line and uncomment the bottom line
-  //var img = "<img src='/images/aloader.gif' class='loading'/>";
-  
+  // ensure that the image directory matches
+  // var img = "<img src='/img/aloader.gif' class='loading'/>";
 
   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;
+  var handlers = navbar.data ? navbar.data('events') : jQuery._data(navbar[0], 'events');
 
-  if (-1 !== $.inArray(onNavbarClick, handlers)) {
+  if (!handlers || -1 !== $.inArray(onNavbarClick, handlers.click)) {
       $(document).on("click", ".pagination.alpha a", onNavbarClick);
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphabetical_paginate
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors: