X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..899891fe8a16934ab98b16456ea95d9f9c81587d:/lib/classic_pagination/pagination_helper.rb diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb index 01260f9e0..238b8836e 100644 --- a/lib/classic_pagination/pagination_helper.rb +++ b/lib/classic_pagination/pagination_helper.rb @@ -56,12 +56,12 @@ module ActionView # pagination_links(@person_pages, :params => { :viewer => "flash" }) # # => 1 2 3 ... # # 10 - def pagination_links(paginator, options={}, html_options={}) + def pagination_links(paginator, options = {}, html_options = {}) 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 @@ -99,16 +99,17 @@ module ActionView window_pages = current_page.window(options[:window_size]).pages return if window_pages.length <= 1 unless link_to_current_page - first, last = paginator.first, paginator.last + first = paginator.first + last = paginator.last - html = '' + html = "" html << prefix if prefix - if always_show_anchors and not (wp_first = window_pages[0]).first? + 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| @@ -117,11 +118,11 @@ module ActionView else html << yield(page.number) end - html << ' ' + html << " " end - if always_show_anchors and not (wp_last = window_pages[-1]).last? - html << ' ... ' if last.number - wp_last.number > 1 + if always_show_anchors && !(wp_last = window_pages[-1]).last? + html << " ... " if last.number - wp_last.number > 1 html << yield(last.number) end @@ -129,7 +130,6 @@ module ActionView html end - end # PaginationHelper end # Helpers end # ActionView