dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use paginate_path and don't help too much

This commit is contained in:
Parker Moore 2013-04-09 21:00:27 +02:00
parent c9a8a1b29f
commit 88f92729bc
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/jekyll/generators/pagination.rb
View File

@ -79,23 +79,11 @@ module Jekyll
# #
# Returns the pagination path as a string # Returns the pagination path as a string
def self.paginate_path(site_config, num_page) def self.paginate_path(site_config, num_page)
return "/" if num_page.nil? || num_page <= 1 return nil if num_page.nil? || num_page <= 1
format = site_config['paginate_path'] format = site_config['paginate_path']
format.sub(':num', num_page.to_s) format.sub(':num', num_page.to_s)
end end
# Static: Return the URL for the pagination path of the page
#
# site_config - the site config
# num_page - the pagination page number
#
# Returns the the absolute URL for the pagination page
def self.paginate_url(site_config, num_page)
return nil if num_page.nil?
path = paginate_path(site_config, num_page)
File.join(site_config["baseurl"], path)
end
# Initialize a new Pager. # Initialize a new Pager.
# #
# config - The Hash configuration of the site. # config - The Hash configuration of the site.
@ -118,9 +106,9 @@ module Jekyll
@total_posts = all_posts.size @total_posts = all_posts.size
@posts = all_posts[init..offset] @posts = all_posts[init..offset]
@previous_page = @page != 1 ? @page - 1 : nil @previous_page = @page != 1 ? @page - 1 : nil
@previous_page_path = Pager.paginate_url(config, @previous_page) @previous_page_path = Pager.paginate_path(config, @previous_page)
@next_page = @page != @total_pages ? @page + 1 : nil @next_page = @page != @total_pages ? @page + 1 : nil
@next_page_path = Pager.paginate_url(config, @next_page) @next_page_path = Pager.paginate_path(config, @next_page)
end end
# Convert this Pager's data to a Hash suitable for use by Liquid. # Convert this Pager's data to a Hash suitable for use by Liquid.

4
site/_posts/2012-07-01-pagination.md
View File

@ -77,7 +77,7 @@ attributes:
<td><p><code>previous_page_path</code></p></td> <td><p><code>previous_page_path</code></p></td>
<td> <td>
<p> <p>
path (including leading "/") of previous pagination page, path of previous pagination page,
or <code>nil</code> if no previous page exists or <code>nil</code> if no previous page exists
</p> </p>
</td> </td>
@ -95,7 +95,7 @@ attributes:
<td><p><code>next_page_path</code></p></td> <td><p><code>next_page_path</code></p></td>
<td> <td>
<p> <p>
path (including leading "/") of next pagination page, path of next pagination page,
or <code>nil</code> if no subsequent page exists or <code>nil</code> if no subsequent page exists
</p> </p>
</td> </td>