From a40e3506f37213f14cc6ac9816ed6f5e24da3c5b Mon Sep 17 00:00:00 2001 From: James Date: Wed, 27 May 2020 21:54:09 +0800 Subject: [PATCH 1/5] Cache mismatch PR comment fixes --- lib/jekyll-paginate-v2/generator/paginationPage.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/jekyll-paginate-v2/generator/paginationPage.rb b/lib/jekyll-paginate-v2/generator/paginationPage.rb index 494cda9..c5f5918 100644 --- a/lib/jekyll-paginate-v2/generator/paginationPage.rb +++ b/lib/jekyll-paginate-v2/generator/paginationPage.rb @@ -13,7 +13,8 @@ def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext) @site = page_to_copy.site @base = '' @url = '' - @name = index_pageandext.nil? ? 'index.html' : index_pageandext + @name = (index_pageandext.nil? || index_pageandext.split('.')[0].length) ? 'index.html' : index_pageandext + @path = page_to_copy.path self.process(@name) # Creates the basename and ext member values @@ -41,6 +42,8 @@ def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext) end def set_url(url_value) + @path = path[0] == '/' ? path[1..-1] : path + @dir = File.dirname(@path) @url = url_value end end # class PaginationPage From 44b126d525f7bf86ae2af784647771dd8898a612 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 27 May 2020 22:18:05 +0800 Subject: [PATCH 2/5] Fix wrong variable --- lib/jekyll-paginate-v2/generator/paginationPage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-paginate-v2/generator/paginationPage.rb b/lib/jekyll-paginate-v2/generator/paginationPage.rb index c5f5918..6aaa323 100644 --- a/lib/jekyll-paginate-v2/generator/paginationPage.rb +++ b/lib/jekyll-paginate-v2/generator/paginationPage.rb @@ -42,7 +42,7 @@ def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext) end def set_url(url_value) - @path = path[0] == '/' ? path[1..-1] : path + @path = url_value[0] == '/' ? url_value[1..-1] : url_value @dir = File.dirname(@path) @url = url_value end From d37d45d2610196cb3d023fe51404c598631ddef1 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 27 May 2020 22:39:37 +0800 Subject: [PATCH 3/5] Compare len to 0 --- lib/jekyll-paginate-v2/generator/paginationPage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-paginate-v2/generator/paginationPage.rb b/lib/jekyll-paginate-v2/generator/paginationPage.rb index 6aaa323..9586927 100644 --- a/lib/jekyll-paginate-v2/generator/paginationPage.rb +++ b/lib/jekyll-paginate-v2/generator/paginationPage.rb @@ -13,7 +13,7 @@ def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext) @site = page_to_copy.site @base = '' @url = '' - @name = (index_pageandext.nil? || index_pageandext.split('.')[0].length) ? 'index.html' : index_pageandext + @name = (index_pageandext.nil? || index_pageandext.split('.')[0].length == 0) ? 'index.html' : index_pageandext @path = page_to_copy.path self.process(@name) # Creates the basename and ext member values From c19589eae8613c856968ab75b32594718a2636b4 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 27 May 2020 23:09:32 +0800 Subject: [PATCH 4/5] Compare index_pageandext directly to .html --- lib/jekyll-paginate-v2/generator/paginationPage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-paginate-v2/generator/paginationPage.rb b/lib/jekyll-paginate-v2/generator/paginationPage.rb index 9586927..b90167d 100644 --- a/lib/jekyll-paginate-v2/generator/paginationPage.rb +++ b/lib/jekyll-paginate-v2/generator/paginationPage.rb @@ -13,7 +13,7 @@ def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext) @site = page_to_copy.site @base = '' @url = '' - @name = (index_pageandext.nil? || index_pageandext.split('.')[0].length == 0) ? 'index.html' : index_pageandext + @name = (index_pageandext.nil? || index_pageandext == '.html') ? 'index.html' : index_pageandext @path = page_to_copy.path self.process(@name) # Creates the basename and ext member values From 8a1df6405618fdbe922b9f4419bed59cab9d31fd Mon Sep 17 00:00:00 2001 From: James Date: Wed, 27 May 2020 23:11:54 +0800 Subject: [PATCH 5/5] Tab -> Spaces --- lib/jekyll-paginate-v2/generator/paginationPage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-paginate-v2/generator/paginationPage.rb b/lib/jekyll-paginate-v2/generator/paginationPage.rb index b90167d..d4bbf32 100644 --- a/lib/jekyll-paginate-v2/generator/paginationPage.rb +++ b/lib/jekyll-paginate-v2/generator/paginationPage.rb @@ -13,7 +13,7 @@ def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext) @site = page_to_copy.site @base = '' @url = '' - @name = (index_pageandext.nil? || index_pageandext == '.html') ? 'index.html' : index_pageandext + @name = (index_pageandext.nil? || index_pageandext == '.html') ? 'index.html' : index_pageandext @path = page_to_copy.path self.process(@name) # Creates the basename and ext member values