From df4276e6d7d6f94569d110dd3bde6e4a81305b76 Mon Sep 17 00:00:00 2001 From: Parcly Taxel Date: Sat, 29 Feb 2020 16:38:47 +0800 Subject: [PATCH 1/2] Fix reload inconsistency when updating frontmatter The header, footer and navigation frontmatter for the minimal and default site templates are empty. This causes inconsistent reloading when the frontmatter is changed (#1001). Here we populate said frontmatter. --- src/template/default/_markbind/footers/footer.md | 2 +- .../default/_markbind/layouts/default/footer.md | 6 ++++++ .../default/_markbind/layouts/default/header.md | 16 ++++++++++++++++ .../_markbind/layouts/default/navigation.md | 8 ++++++++ .../minimal/_markbind/layouts/default/footer.md | 3 +++ .../minimal/_markbind/layouts/default/header.md | 3 +++ .../_markbind/layouts/default/navigation.md | 3 +++ .../test_default/expected/contents/topic1.html | 5 +++++ .../test_default/expected/contents/topic2.html | 5 +++++ .../test_default/expected/contents/topic3a.html | 5 +++++ .../test_default/expected/contents/topic3b.html | 5 +++++ .../test_default/expected/index.html | 5 +++++ .../test_minimal/expected/index.html | 5 +++++ 13 files changed, 70 insertions(+), 1 deletion(-) diff --git a/src/template/default/_markbind/footers/footer.md b/src/template/default/_markbind/footers/footer.md index e5f2864c41..189ca1c0b5 100644 --- a/src/template/default/_markbind/footers/footer.md +++ b/src/template/default/_markbind/footers/footer.md @@ -1,6 +1,6 @@ diff --git a/src/template/default/_markbind/layouts/default/footer.md b/src/template/default/_markbind/layouts/default/footer.md index e69de29bb2..189ca1c0b5 100644 --- a/src/template/default/_markbind/layouts/default/footer.md +++ b/src/template/default/_markbind/layouts/default/footer.md @@ -0,0 +1,6 @@ + diff --git a/src/template/default/_markbind/layouts/default/header.md b/src/template/default/_markbind/layouts/default/header.md index e69de29bb2..cadbbb5a5c 100644 --- a/src/template/default/_markbind/layouts/default/header.md +++ b/src/template/default/_markbind/layouts/default/header.md @@ -0,0 +1,16 @@ +
+ + Your Logo +
  • Topic 1
    • +
  • Topic 2
    • + +
  • Topic 3a
    • +
  • Topic 3b
    • +     +
  • +
    + +
    +
    • +     +
    diff --git a/src/template/default/_markbind/layouts/default/navigation.md b/src/template/default/_markbind/layouts/default/navigation.md index e69de29bb2..8533e5b1f7 100644 --- a/src/template/default/_markbind/layouts/default/navigation.md +++ b/src/template/default/_markbind/layouts/default/navigation.md @@ -0,0 +1,8 @@ + +* [Home :house:]({{ baseUrl }}/index.html) +* [Topic 1]({{baseUrl}}/contents/topic1.html) +* [Topic 2]({{baseUrl}}/contents/topic2.html) +* Topic 3 :expanded: + * [Topic 3a]({{baseUrl}}/contents/topic3a.html) + * [Topic 3b]({{baseUrl}}/contents/topic3b.html) + diff --git a/src/template/minimal/_markbind/layouts/default/footer.md b/src/template/minimal/_markbind/layouts/default/footer.md index e69de29bb2..0ed3a6c779 100644 --- a/src/template/minimal/_markbind/layouts/default/footer.md +++ b/src/template/minimal/_markbind/layouts/default/footer.md @@ -0,0 +1,3 @@ + diff --git a/src/template/minimal/_markbind/layouts/default/header.md b/src/template/minimal/_markbind/layouts/default/header.md index e69de29bb2..194c7a4859 100644 --- a/src/template/minimal/_markbind/layouts/default/header.md +++ b/src/template/minimal/_markbind/layouts/default/header.md @@ -0,0 +1,3 @@ +
    + +
    diff --git a/src/template/minimal/_markbind/layouts/default/navigation.md b/src/template/minimal/_markbind/layouts/default/navigation.md index e69de29bb2..8ce3a71d46 100644 --- a/src/template/minimal/_markbind/layouts/default/navigation.md +++ b/src/template/minimal/_markbind/layouts/default/navigation.md @@ -0,0 +1,3 @@ + + + diff --git a/test/functional/test_site_templates/test_default/expected/contents/topic1.html b/test/functional/test_site_templates/test_default/expected/contents/topic1.html index c750aca149..d888b2c797 100644 --- a/test/functional/test_site_templates/test_default/expected/contents/topic1.html +++ b/test/functional/test_site_templates/test_default/expected/contents/topic1.html @@ -66,6 +66,11 @@

    Topic 1

    + diff --git a/test/functional/test_site_templates/test_default/expected/contents/topic2.html b/test/functional/test_site_templates/test_default/expected/contents/topic2.html index 283999f394..971ff62a4e 100644 --- a/test/functional/test_site_templates/test_default/expected/contents/topic2.html +++ b/test/functional/test_site_templates/test_default/expected/contents/topic2.html @@ -64,6 +64,11 @@ This is a placeholder page + diff --git a/test/functional/test_site_templates/test_default/expected/contents/topic3a.html b/test/functional/test_site_templates/test_default/expected/contents/topic3a.html index 6c2b117f45..40c6977993 100644 --- a/test/functional/test_site_templates/test_default/expected/contents/topic3a.html +++ b/test/functional/test_site_templates/test_default/expected/contents/topic3a.html @@ -64,6 +64,11 @@ This is a placeholder page + diff --git a/test/functional/test_site_templates/test_default/expected/contents/topic3b.html b/test/functional/test_site_templates/test_default/expected/contents/topic3b.html index c306bfb1fe..d5e8608735 100644 --- a/test/functional/test_site_templates/test_default/expected/contents/topic3b.html +++ b/test/functional/test_site_templates/test_default/expected/contents/topic3b.html @@ -64,6 +64,11 @@ This is a placeholder page + diff --git a/test/functional/test_site_templates/test_default/expected/index.html b/test/functional/test_site_templates/test_default/expected/index.html index 8b33229185..b012e6a10a 100644 --- a/test/functional/test_site_templates/test_default/expected/index.html +++ b/test/functional/test_site_templates/test_default/expected/index.html @@ -197,6 +197,11 @@

    Heading 3

    + diff --git a/test/functional/test_site_templates/test_minimal/expected/index.html b/test/functional/test_site_templates/test_minimal/expected/index.html index a6e4cf203c..32bd1ec2f8 100644 --- a/test/functional/test_site_templates/test_minimal/expected/index.html +++ b/test/functional/test_site_templates/test_minimal/expected/index.html @@ -16,11 +16,16 @@ +
    +
    +

    Welcome to Markbind

    This is a minimalistic template. To learn more about authoring contents in Markbind, visit the User Guide.

    From b868d0267834c120123dc4757ecfcd439462c83e Mon Sep 17 00:00:00 2001 From: Parcly Taxel Date: Sun, 1 Mar 2020 01:20:48 +0800 Subject: [PATCH 2/2] Reset page sections upon collection --- src/Page.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Page.js b/src/Page.js index c1713c3e21..c3cc4705d7 100644 --- a/src/Page.js +++ b/src/Page.js @@ -763,6 +763,7 @@ class Page { } collectAllPageSections() { + this.pageSectionsHtml = {}; // This resets the pageSectionsHTML whenever we collect. this.collectPageSection('header'); this.collectPageSection(`#${SITE_NAV_ID}`); this.collectPageSection('footer');