config/initializers/will_paginate.rb in casein-5.3.2.0 vs config/initializers/will_paginate.rb in casein-5.4.0.0

- old
+ new

@@ -1,28 +1,32 @@ +# frozen_string_literal: true + # config/initializers/will_paginate.rb -# +# # This extension code was written by Isaac Bowen, originally found # at http://isaacbowen.com/blog/using-will_paginate-action_view-and-bootstrap/ require 'will_paginate/view_helpers/action_view' module WillPaginate module ActionView - def will_paginate(collection = nil, options = {}) - options, collection = collection, nil if collection.is_a? Hash + if collection.is_a? Hash + options = collection + collection = nil + end # Taken from original will_paginate code to handle if the helper is not passed a collection object. - collection ||= infer_collection_from_controller + collection ||= infer_collection_from_controller options[:renderer] ||= BootstrapLinkRenderer super.try :html_safe end class BootstrapLinkRenderer < LinkRenderer protected - + def html_container(html) - tag :div, tag(:ul, html, class: "pagination"), container_attributes + tag :div, tag(:ul, html, class: 'pagination'), container_attributes end def page_number(page) tag :li, link(page, page, rel: rel_value(page)), class: ('active' if page == current_page) end @@ -31,10 +35,10 @@ tag :li, link('&hellip;'.html_safe, '#'), class: 'disabled' end def previous_or_next_page(page, text, classname) tag :li, link(text, page || '#'), - class: [(classname[0..3] if @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page)].join(' ') + class: [(classname[0..3] if @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page)].join(' ') end end end -end \ No newline at end of file +end