X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..a3606e00b472a8cd5775fa13a9c0a14da9290c91:/lib/classic_pagination/pagination_helper.rb diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb index cb7ef9dfe..3ff3c3b95 100644 --- a/lib/classic_pagination/pagination_helper.rb +++ b/lib/classic_pagination/pagination_helper.rb @@ -13,7 +13,7 @@ module ActionView :always_show_anchors => true, :link_to_current_page => false, :params => {} - } + }.freeze end # Creates a basic HTML link bar for the given +paginator+. Links will be created @@ -60,8 +60,8 @@ module ActionView name = options[:name] || DEFAULT_OPTIONS[:name] params = (options[:params] || DEFAULT_OPTIONS[:params]).clone - prefix = options[:prefix] || '' - suffix = options[:suffix] || '' + prefix = options[:prefix] || "" + suffix = options[:suffix] || "" pagination_links_each(paginator, options, prefix, suffix) do |n| params[name] = n @@ -97,31 +97,32 @@ module ActionView current_page = paginator.current_page window_pages = current_page.window(options[:window_size]).pages - return if window_pages.length <= 1 unless link_to_current_page + return unless link_to_current_page || window_pages.length > 1 - first, last = paginator.first, paginator.last + first = paginator.first + last = paginator.last - html = '' + html = "" html << prefix if prefix if always_show_anchors && !(wp_first = window_pages[0]).first? html << yield(first.number) - html << ' ... ' if wp_first.number - first.number > 1 - html << ' ' + html << " ... " if wp_first.number - first.number > 1 + html << " " end window_pages.each do |page| - if current_page == page && !link_to_current_page - html << page.number.to_s - else - html << yield(page.number) - end - html << ' ' + html << if current_page == page && !link_to_current_page + page.number.to_s + else + yield(page.number) + end + html << " " end if always_show_anchors && !(wp_last = window_pages[-1]).last? - html << ' ... ' if last.number - wp_last.number > 1 + html << " ... " if last.number - wp_last.number > 1 html << yield(last.number) end @@ -129,6 +130,6 @@ module ActionView html end - end # PaginationHelper - end # Helpers -end # ActionView + end + end +end