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

support dropbox as well as multiple themes in theme folder

Browse Source
This commit is contained in:
AJ ONeal 2015-01-21 13:23:16 -07:00
parent be42f327df
commit 4badae9aba
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
desirae.js
View File

@ -850,7 +850,16 @@
view.contents = mustached; view.contents = mustached;
// shallowClone to prevent perfect object equality (and potential template caching) // shallowClone to prevent perfect object equality (and potential template caching)
view.entity.original_base_path = view.entity.base_path;
view.entity.home_path = view.entity.base_path + '/index.html';
env.original_base_path = env.base_path;
if (env.explicitIndexes) {
view.entity.base_path = view.entity.base_path + '/index.html';
env.base_path = env.base_path + '/index.html';
}
newview = datamap(view); newview = datamap(view);
env.base_path = env.original_base_path;
view.entity.base_path = view.entity.original_base_path;
mustached = Mustache.render(html, newview, desi.partials); mustached = Mustache.render(html, newview, desi.partials);
return mustached; return mustached;
@ -870,6 +879,9 @@
var compiled = [] var compiled = []
; ;
if (/dropbox/.test(env.base_url)) {
env.explicitIndexes = true;
}
env.transforms = env.transforms || []; env.transforms = env.transforms || [];
desi.transforms = (desi.transforms || []).concat(env.transforms); desi.transforms = (desi.transforms || []).concat(env.transforms);
desi.transforms.push(function (view) { desi.transforms.push(function (view) {
@ -907,13 +919,24 @@
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
; ;
// TODO still have some index.html mess to work out... // TODO still have some index.html mess to work out...
entity.file_url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/$/, '/index.html');
if (env.explicitIndexes) {
// pretty much just dropbox and very strict apache configs
entity.url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/$/, '/index.html');
entity.canonical_url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/$/, '/index.html');
entity.production_url = desi.site.base_url + path.join(desi.site.base_path, entity.yml.permalink).replace(/\/$/, '/index.html');
entity.relative_url = path.join(env.base_path, entity.yml.permalink).replace(/\/$/, '/index.html');
} else {
entity.url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/index.html$/, '/'); entity.url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/index.html$/, '/');
entity.canonical_url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/index.html$/, '/'); entity.canonical_url = env.base_url + path.join(env.base_path, entity.yml.permalink).replace(/\/index.html$/, '/');
entity.production_url = desi.site.base_url + path.join(desi.site.base_path, entity.yml.permalink).replace(/\/index.html$/, '/'); entity.production_url = desi.site.base_url + path.join(desi.site.base_path, entity.yml.permalink).replace(/\/index.html$/, '/');
entity.relative_url = path.join(env.base_path, entity.yml.permalink).replace(/\/index.html$/, '/'); entity.relative_url = path.join(env.base_path, entity.yml.permalink).replace(/\/index.html$/, '/');
}
// TODO nested names? // TODO nested names?
navigation.forEach(function (nav) { navigation.forEach(function (nav) {
@ -924,6 +947,10 @@
if (nav.href.replace(/(\/)?(\/index)?(\.html)?$/i, '') === entity.relative_url.replace(/(\/)?(\/index)?(\.html)?$/i, '')) { if (nav.href.replace(/(\/)?(\/index)?(\.html)?$/i, '') === entity.relative_url.replace(/(\/)?(\/index)?(\.html)?$/i, '')) {
nav.active = true; nav.active = true;
} }
if (env.explicitIndexes) {
nav.href = nav.href + '/index.html';
nav.path = nav.path + '/index.html';
}
}); });
view = { view = {
@ -939,11 +966,17 @@
, author: num2str(author) , author: num2str(author)
}; };
desi.allStyles = desi.styles;
desi.styles = desi.styles.filter(function (str) {
// TODO better matching
return str.match('/' + themename + '/');
});
desi.transforms.forEach(function (fn) { desi.transforms.forEach(function (fn) {
view = fn(view); view = fn(view);
}); });
return renderLayers(desi, env, view, entity).then(function (html) { return renderLayers(desi, env, view, entity).then(function (html) {
desi.styles = desi.allStyles;
// NOTE: by now, all permalinks should be in the format /path/to/page.html or /path/to/page/index.html // NOTE: by now, all permalinks should be in the format /path/to/page.html or /path/to/page/index.html
if (/^(index)?(\/?index.html)?$/.test(entity.yml.permalink)) { if (/^(index)?(\/?index.html)?$/.test(entity.yml.permalink)) {
console.info('found compiled index'); console.info('found compiled index');