coolaj86
/
desirae.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

seems to work as good as old

This commit is contained in:
AJ ONeal 2015-01-23 04:07:40 -07:00
parent 73112a8677
commit 3c2e4e7e63
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desirae.js
View File

@ -265,7 +265,7 @@
; ;
if (!themename) { if (!themename) {
themename = desi.site.theme; themename = desi.site.theme || desi.config.theme;
} }
// TODO NO DEFAULTS // TODO NO DEFAULTS
@ -824,7 +824,7 @@
; ;
// BUG XXX the entity doesn't get a datamap (though it probably doesn't need one) // BUG XXX the entity doesn't get a datamap (though it probably doesn't need one)
layers = getLayout(desi, entity.yml.theme, entity.yml.layout, [entity]); layers = getLayout(desi, entity.theme, entity.layout, [entity]);
return forEachAsync(layers, function (current) { return forEachAsync(layers, function (current) {
var body = (current.body || current.contents || '').trim() var body = (current.body || current.contents || '').trim()
@ -897,7 +897,7 @@
var navigation = JSON.parse(JSON.stringify(desi.navigation)) var navigation = JSON.parse(JSON.stringify(desi.navigation))
, author = desi.authors[entity.yml.author] || desi.authors[Object.keys(desi.authors)[0]] , author = desi.authors[entity.yml.author] || desi.authors[Object.keys(desi.authors)[0]]
, view , view
, themename = entity.yml.theme || desi.site.theme , themename = entity.theme || desi.site.theme
; ;
if (!author) { if (!author) {

5
lib/transform-core.js
View File

@ -165,6 +165,11 @@
entity[url] = entity[url].replace(/\/$/, '/index.html'); entity[url] = entity[url].replace(/\/$/, '/index.html');
}); });
} }
// i.e. bootstrap, hero page, darkly
entity.theme = entity.theme || entity.yml.theme;
entity.layout = entity.layout || entity.yml.layout;
entity.swatch = entity.swatch || entity.yml.swatch;
}; };
cores.disqus = function (desi, env, collection, entity) { cores.disqus = function (desi, env, collection, entity) {