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

whitespace fix

This commit is contained in:
AJ ONeal 2017-04-07 00:22:42 -06:00
parent dd0f0e6e3c
commit 3a4deb9e0e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desirae.js
View File

@ -143,7 +143,7 @@
Desi.permalinkify = function (desi, purl, entity) { Desi.permalinkify = function (desi, purl, entity) {
var parts = purl.split('/') var parts = purl.split('/')
; ;
// when created from the web or cmd the file doesn't yet exist // when created from the web or cmd the file doesn't yet exist
if (!entity.name) { if (!entity.name) {
entity.name = entity.slug + '.html'; entity.name = entity.slug + '.html';
@ -345,12 +345,12 @@
d.hour = m[4] = Desi.pad(m[5] || '00'); // hours d.hour = m[4] = Desi.pad(m[5] || '00'); // hours
d.minute = m[5] = Desi.pad(m[6] || '00'); // minutes d.minute = m[5] = Desi.pad(m[6] || '00'); // minutes
d.second = m[6] = Desi.pad(m[8] || '00'); // seconds d.second = m[6] = Desi.pad(m[8] || '00'); // seconds
if (parseInt(m[4], 10) > 12) { if (parseInt(m[4], 10) > 12) {
d.twelve_hour = m[7] = m[4] - 12; // 12-hour d.twelve_hour = m[7] = m[4] - 12; // 12-hour
d.meridian = m[8] = 'pm'; // am/pm d.meridian = m[8] = 'pm'; // am/pm
} else { } else {
d.twelve_hour = m[7] = m[4]; d.twelve_hour = m[7] = m[4];
d.meridian = m[8] = 'am'; d.meridian = m[8] = 'am';
} }
@ -386,7 +386,7 @@
]).then(function (plop) { ]).then(function (plop) {
var arr = plop[0] var arr = plop[0]
//, blogdir = plop[1] //, blogdir = plop[1]
; ;
//desi.blogdir = blogdir; //desi.blogdir = blogdir;
//desi.originals = {}; //desi.originals = {};
@ -432,7 +432,7 @@
return PromiseA.all([ return PromiseA.all([
Desi.fsapi.getMeta( Desi.fsapi.getMeta(
themenames.map(function (n) { return path.join(THEME_PREFIX, n); }) themenames.map(function (n) { return path.join(THEME_PREFIX, n); })
, { dotfiles: false , { dotfiles: false
, extensions: Object.keys(Desi._exts.themes) , extensions: Object.keys(Desi._exts.themes)
} }
) )
@ -450,7 +450,7 @@
) )
, Desi.fsapi.getMeta( , Desi.fsapi.getMeta(
assetnames assetnames
, { dotfiles: false , { dotfiles: false
//, extensions: Object.keys(Desi._exts.assets) //, extensions: Object.keys(Desi._exts.assets)
} }
) )
@ -468,7 +468,7 @@
metaf.path = path.join(metaf.relativePath, metaf.name); metaf.path = path.join(metaf.relativePath, metaf.name);
if (metaf.error) { if (metaf.error) {
console.error("Couldn't read '" + metaf.path + "'"); console.error("Couldn't read '" + metaf.path + "'");
console.error(metaf.error); console.error(metaf.error);
@ -612,7 +612,7 @@
return desi; return desi;
}); });
}); });
}; };
Desi.copyAssets = function(desi, env) { Desi.copyAssets = function(desi, env) {
var files = {} var files = {}
@ -833,7 +833,7 @@
return Desi.render(current.ext, body, view).then(function (html) { return Desi.render(current.ext, body, view).then(function (html) {
// TODO organize datamap inheritence // TODO organize datamap inheritence
var datamap = Desi._datamaps[current.config && current.datamap] var datamap = Desi._datamaps[current.config && current.datamap]
|| Desi._datamaps[env.datamap] || Desi._datamaps[env.datamap]
|| Desi._datamaps[entity.datamap] || Desi._datamaps[entity.datamap]
|| Desi._datamaps['ruhoh@2.6'] || Desi._datamaps['ruhoh@2.6']
, newview , newview
@ -927,7 +927,7 @@
if (!/\.x?html?$/.test(nav.href)) { if (!/\.x?html?$/.test(nav.href)) {
// add trailing slash // add trailing slash
nav.href += '/'; nav.href += '/';
} }
if (nav.href.replace(/(\/)?(\/index)?(\.html)?$/i, '') if (nav.href.replace(/(\/)?(\/index)?(\.html)?$/i, '')