Merge remote-tracking branch 'upstream/pull/3791'

[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 238b8836e919a834bbe1daca3e2108174aacd96f..3ff3c3b950974f515bb4f41cc9e09617d320d3f0 100644 (file)
--- 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 => {}
           :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
       end
 
       # Creates a basic HTML link bar for the given +paginator+.  Links will be created


@@ -97,7 +97,7 @@ 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 = paginator.first
         last = paginator.last
 
         first = paginator.first
         last = paginator.last


@@ -113,11 +113,11 @@ module ActionView
         end
 
         window_pages.each do |page|
         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 << if current_page == page && !link_to_current_page
+                    page.number.to_s
+                  else
+                    yield(page.number)
+                  end

           html << " "
         end
 
           html << " "
         end
 


@@ -130,6 +130,6 @@ module ActionView
 
         html
       end
 
         html
       end

-    end # PaginationHelper
-  end # Helpers
-end # ActionView
+    end
+  end
+end