Merge branch 'pull/4985'

[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..c450de4e149b6cff38bb3ab3a787789dd3ccc725 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


@@ -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,31 +97,32 @@ 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|

-          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?
         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
 


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

-    end # PaginationHelper
-  end # Helpers
-end # ActionView
+
+      def pagination_items(paginator, options)
+        options = DEFAULT_OPTIONS.merge(options)
+        link_to_current_page = options[:link_to_current_page]
+        always_show_anchors = options[:always_show_anchors]
+
+        current_page = paginator.current_page
+        window_pages = current_page.window(options[:window_size]).pages
+
+        first = paginator.first
+        last = paginator.last
+
+        items = []
+
+        if always_show_anchors && !(wp_first = window_pages[0]).first?
+          items.push [first.number.to_s, first]
+          items.push ["...", "disabled"] if wp_first.number - first.number > 1
+        end
+
+        window_pages.each do |page|
+          if current_page == page && !link_to_current_page
+            items.push [page.number.to_s, "active"]
+          else
+            items.push [page.number.to_s, page]
+          end
+        end
+
+        if always_show_anchors && !(wp_last = window_pages[-1]).last?
+          items.push ["...", "disabled"] if last.number - wp_last.number > 1
+          items.push [last.number.to_s, last]
+        end
+
+        items
+      end
+    end
+  end
+end