Preserve URL fragments through external authentication

[rails.git] / lib / classic_pagination / pagination_helper.rb

diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb
index cb7ef9dfedaa0aef39e7dddb2804bfd131455071..ae03b82b25ef9aa96135a8b7570d58d2e66fe1ac 100644 (file)
--- a/lib/classic_pagination/pagination_helper.rb
+++ b/lib/classic_pagination/pagination_helper.rb
@@ -60,8 +60,8 @@ module ActionView
         name = options[:name] || DEFAULT_OPTIONS[:name]
         params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
 
         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
 
         pagination_links_each(paginator, options, prefix, suffix) do |n|
           params[name] = n


@@ -97,18 +97,19 @@ module ActionView
 
         current_page = paginator.current_page
         window_pages = current_page.window(options[:window_size]).pages
 
         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 << 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|
         end
 
         window_pages.each do |page|


@@ -117,11 +118,11 @@ module ActionView
           else
             html << yield(page.number)
           end
           else
             html << yield(page.number)
           end

-          html << ' '
+          html << " "

         end
 
         if always_show_anchors && !(wp_last = window_pages[-1]).last?
         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
 
           html << yield(last.number)
         end