diff --git a/src/Page.js b/src/Page.js index 0619285692..ace8bf19b0 100644 --- a/src/Page.js +++ b/src/Page.js @@ -399,8 +399,8 @@ Page.prototype.collectFrontMatter = function (includedPage) { this.frontMatter.src = this.src; // Title specified in site.json will override title specified in front matter this.frontMatter.title = (this.title || this.frontMatter.title || ''); - // Layout specified in front matter will override layout specified in site.json - this.frontMatter.layout = (this.frontMatter.layout || this.layout || ''); + // Layout specified in site.json will override layout specified in the front matter + this.frontMatter.layout = (this.layout || this.frontMatter.layout || LAYOUT_DEFAULT_NAME); } else { // Page is addressable but no front matter specified this.frontMatter = { diff --git a/src/Site.js b/src/Site.js index 9460f53082..e49cd2ccf8 100644 --- a/src/Site.js +++ b/src/Site.js @@ -602,7 +602,7 @@ Site.prototype.generatePages = function () { faviconUrl, pageSrc: page.src, title: page.title, - layout: page.layout || LAYOUT_DEFAULT_NAME, + layout: page.layout, searchable: page.searchable !== 'no', })); } else { @@ -610,7 +610,7 @@ Site.prototype.generatePages = function () { faviconUrl, pageSrc: page.src, title: page.title, - layout: page.layout || LAYOUT_DEFAULT_NAME, + layout: page.layout, searchable: page.searchable !== 'no', })); } diff --git a/test/test_site/expected/siteData.json b/test/test_site/expected/siteData.json index 4bb7e860ab..4c6c6bb697 100644 --- a/test/test_site/expected/siteData.json +++ b/test/test_site/expected/siteData.json @@ -62,8 +62,8 @@ "footer": "footer.md", "siteNav": "site-nav.md", "head": "myCustomHead.md, myCustomHead2.md", - "layout": "default", - "src": "index.md" + "src": "index.md", + "layout": "default" }, { "headings": {}, @@ -73,12 +73,21 @@ }, { "headings": { - "uses-a-layout": "Uses a layout" + "uses-a-front-matter-layout": "Uses a front matter layout" + }, + "title": "Hello World", + "head": "overwriteLayoutHead.md", + "layout": "testLayout", + "src": "testLayouts.md" + }, + { + "headings": { + "uses-a-site.json-layout%2C-overriding-front-matter": "Uses a site.json layout, overriding front matter" }, "title": "Hello World", "head": "overwriteLayoutHead.md", - "src": "testLayouts.md", - "layout": "testLayout" + "layout": "testLayout", + "src": "testLayoutsOverride.md" }, { "headings": { diff --git a/test/test_site/expected/testLayouts.html b/test/test_site/expected/testLayouts.html index 0239f6dd38..81de1395b2 100644 --- a/test/test_site/expected/testLayouts.html +++ b/test/test_site/expected/testLayouts.html @@ -34,7 +34,7 @@
-

Uses a layout

+

Uses a front matter layout

diff --git a/test/test_site/expected/testLayoutsOverride.html b/test/test_site/expected/testLayoutsOverride.html new file mode 100644 index 0000000000..0a292379d5 --- /dev/null +++ b/test/test_site/expected/testLayoutsOverride.html @@ -0,0 +1,58 @@ + + + + + + + + Hello World + + + + + + + + + + + + +
+
+ + +
+
+

Uses a site.json layout, overriding front matter

+
+
+
+
+ +
+ + + + + + + + + diff --git a/test/test_site/index.md b/test/test_site/index.md index cd2f0a4385..3f824ef313 100644 --- a/test/test_site/index.md +++ b/test/test_site/index.md @@ -3,7 +3,6 @@ title: Hello World footer: footer.md siteNav: site-nav.md head: myCustomHead.md, myCustomHead2.md -layout: default diff --git a/test/test_site/site.json b/test/test_site/site.json index c1ca908050..ecf4722a77 100644 --- a/test/test_site/site.json +++ b/test/test_site/site.json @@ -5,8 +5,7 @@ "pages": [ { "src": "index.md", - "title": "Hello World", - "layout": "testLayout" + "title": "Hello World" }, { "src": "testEmptyFrontmatter.md", @@ -15,6 +14,10 @@ }, { "src": "testLayouts.md", + "title": "Hello World" + }, + { + "src": "testLayoutsOverride.md", "title": "Hello World", "layout": "testLayout" }, diff --git a/test/test_site/testLayouts.md b/test/test_site/testLayouts.md index 75d6fb73cd..79f6c94e78 100644 --- a/test/test_site/testLayouts.md +++ b/test/test_site/testLayouts.md @@ -1,6 +1,7 @@ title: Test Layouts head: overwriteLayoutHead.md +layout: testLayout -# Uses a layout \ No newline at end of file +# Uses a front matter layout \ No newline at end of file diff --git a/test/test_site/testLayoutsOverride.md b/test/test_site/testLayoutsOverride.md new file mode 100644 index 0000000000..0cf9e9de3b --- /dev/null +++ b/test/test_site/testLayoutsOverride.md @@ -0,0 +1,7 @@ + +title: Test Layouts +head: overwriteLayoutHead.md +layout: default + + +# Uses a site.json layout, overriding front matter