Override Bootstrap close button inversion inside themed elements

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

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index c59c1a90159fae9990d0fc499ed0437427d1f405..c7022e0b0b914707c549c458f347f89b8bc530a4 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -81,12 +81,12 @@ module ActionController
       }.freeze
     end
 
       }.freeze
     end
 

-    def self.included(base) #:nodoc:
+    def self.included(base) # :nodoc:

       super
       base.extend(ClassMethods)
     end
 
       super
       base.extend(ClassMethods)
     end
 

-    def self.validate_options!(collection_id, options, in_action) #:nodoc:
+    def self.validate_options!(collection_id, options, in_action) # :nodoc:

       options.merge!(DEFAULT_OPTIONS) { |_key, old, _new| old }
 
       valid_options = DEFAULT_OPTIONS.keys
       options.merge!(DEFAULT_OPTIONS) { |_key, old, _new| old }
 
       valid_options = DEFAULT_OPTIONS.keys


@@ -156,7 +156,7 @@ module ActionController
 
     protected
 
 
     protected
 

-    def create_paginators_and_retrieve_collections #:nodoc:
+    def create_paginators_and_retrieve_collections # :nodoc:

       Pagination::OPTIONS[self.class].each do |collection_id, options|
         next if options[:actions]&.exclude?(action_name)
 
       Pagination::OPTIONS[self.class].each do |collection_id, options|
         next if options[:actions]&.exclude?(action_name)
 


@@ -204,7 +204,7 @@ module ActionController
 
     private
 
 
     private
 

-    def paginator_and_collection_for(_collection_id, options) #:nodoc:
+    def paginator_and_collection_for(_collection_id, options) # :nodoc:

       klass = options[:class_name].constantize
       page  = params[options[:parameter]]
       count = count_collection_for_pagination(klass, options)
       klass = options[:class_name].constantize
       page  = params[options[:parameter]]
       count = count_collection_for_pagination(klass, options)


@@ -243,7 +243,7 @@ module ActionController
         raise ArgumentError, "Page/Paginator mismatch" if page.is_a?(Page) && page.paginator != self
 
         page = page.to_i
         raise ArgumentError, "Page/Paginator mismatch" if page.is_a?(Page) && page.paginator != self
 
         page = page.to_i

-        @current_page_number = has_page_number?(page) ? page : 1
+        @current_page_number = contains_page?(page) ? page : 1

       end
 
       # Returns a Page object representing this paginator's current page.
       end
 
       # Returns a Page object representing this paginator's current page.


@@ -277,7 +277,7 @@ module ActionController
       alias length page_count
 
       # Returns true if this paginator contains the page of index +number+.
       alias length page_count
 
       # Returns true if this paginator contains the page of index +number+.

-      def has_page_number?(number)
+      def contains_page?(number)

         number >= 1 && number <= page_count
       end
 
         number >= 1 && number <= page_count
       end
 


@@ -304,7 +304,7 @@ module ActionController
         def initialize(paginator, number)
           @paginator = paginator
           @number = number.to_i
         def initialize(paginator, number)
           @paginator = paginator
           @number = number.to_i

-          @number = 1 unless @paginator.has_page_number? @number
+          @number = 1 unless @paginator.contains_page? @number

         end
         attr_reader :paginator, :number
 
         end
         attr_reader :paginator, :number
 


@@ -378,7 +378,7 @@ module ActionController
           [@paginator.items_per_page, offset]
         end
 
           [@paginator.items_per_page, offset]
         end
 

-        def to_param #:nodoc:
+        def to_param # :nodoc:

           @number.to_s
         end
       end
           @number.to_s
         end
       end


@@ -399,12 +399,12 @@ module ActionController
         def padding=(padding)
           @padding = padding.negative? ? 0 : padding
           # Find the beginning and end pages of the window
         def padding=(padding)
           @padding = padding.negative? ? 0 : padding
           # Find the beginning and end pages of the window

-          @first = if @paginator.has_page_number?(@page.number - @padding)
+          @first = if @paginator.contains_page?(@page.number - @padding)

                      @paginator[@page.number - @padding]
                    else
                      @paginator.first
                    end
                      @paginator[@page.number - @padding]
                    else
                      @paginator.first
                    end

-          @last = if @paginator.has_page_number?(@page.number + @padding)
+          @last = if @paginator.contains_page?(@page.number + @padding)

                     @paginator[@page.number + @padding]
                   else
                     @paginator.last
                     @paginator[@page.number + @padding]
                   else
                     @paginator.last