From 3a4deb9e0e5c5b7b36f524e5c67958d601060fd5 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 7 Apr 2017 00:22:42 -0600 Subject: [PATCH 1/4] whitespace fix --- desirae.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/desirae.js b/desirae.js index c85b255..6abaa26 100644 --- a/desirae.js +++ b/desirae.js @@ -143,7 +143,7 @@ Desi.permalinkify = function (desi, purl, entity) { var parts = purl.split('/') ; - + // when created from the web or cmd the file doesn't yet exist if (!entity.name) { entity.name = entity.slug + '.html'; @@ -345,12 +345,12 @@ d.hour = m[4] = Desi.pad(m[5] || '00'); // hours d.minute = m[5] = Desi.pad(m[6] || '00'); // minutes d.second = m[6] = Desi.pad(m[8] || '00'); // seconds - + if (parseInt(m[4], 10) > 12) { d.twelve_hour = m[7] = m[4] - 12; // 12-hour d.meridian = m[8] = 'pm'; // am/pm } else { - d.twelve_hour = m[7] = m[4]; + d.twelve_hour = m[7] = m[4]; d.meridian = m[8] = 'am'; } @@ -386,7 +386,7 @@ ]).then(function (plop) { var arr = plop[0] //, blogdir = plop[1] - ; + ; //desi.blogdir = blogdir; //desi.originals = {}; @@ -432,7 +432,7 @@ return PromiseA.all([ Desi.fsapi.getMeta( themenames.map(function (n) { return path.join(THEME_PREFIX, n); }) - , { dotfiles: false + , { dotfiles: false , extensions: Object.keys(Desi._exts.themes) } ) @@ -450,7 +450,7 @@ ) , Desi.fsapi.getMeta( assetnames - , { dotfiles: false + , { dotfiles: false //, extensions: Object.keys(Desi._exts.assets) } ) @@ -468,7 +468,7 @@ metaf.path = path.join(metaf.relativePath, metaf.name); - + if (metaf.error) { console.error("Couldn't read '" + metaf.path + "'"); console.error(metaf.error); @@ -612,7 +612,7 @@ return desi; }); }); - }; + }; Desi.copyAssets = function(desi, env) { var files = {} @@ -833,7 +833,7 @@ return Desi.render(current.ext, body, view).then(function (html) { // TODO organize datamap inheritence var datamap = Desi._datamaps[current.config && current.datamap] - || Desi._datamaps[env.datamap] + || Desi._datamaps[env.datamap] || Desi._datamaps[entity.datamap] || Desi._datamaps['ruhoh@2.6'] , newview @@ -927,7 +927,7 @@ if (!/\.x?html?$/.test(nav.href)) { // add trailing slash - nav.href += '/'; + nav.href += '/'; } if (nav.href.replace(/(\/)?(\/index)?(\.html)?$/i, '') From 8d4af3894a564d50545c1660f94c76ab44b11c47 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 7 Apr 2017 00:23:53 -0600 Subject: [PATCH 2/4] show error message for missing theme --- desirae.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desirae.js b/desirae.js index 6abaa26..eedbe49 100644 --- a/desirae.js +++ b/desirae.js @@ -267,6 +267,10 @@ if (!themename) { themename = desi.site.theme || desi.config.theme; } + if (!desi.config.themes[themename]) { + console.error("'" + themename + "' was not found among the themes"); + return arr; + } // TODO NO DEFAULTS if ('__page__' === layoutname) { From 0e9f43fe34c2e5c7ed7b97364514ad4be2f94516 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 7 Apr 2017 01:45:24 -0600 Subject: [PATCH 3/4] expose filename --- lib/utils.js | 5 ++++- package.json | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/utils.js b/lib/utils.js index 6371efc..a1841b9 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -78,7 +78,10 @@ console.error(file); } - obj[keyname][filename] = data || obj[keyname][filename]; + data = obj[keyname][filename] = data || obj[keyname][filename]; + if (data) { + data.filename = file.name; + } /* if (!obj[keyname][filename]) { obj[keyname][filename] = {}; diff --git a/package.json b/package.json index 8380980..b2a3ca4 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "repository": { "type": "git", - "url": "git@github.com:DearDesi/desirae.git" + "url": "git@git.daplie.com:Daplie/desirae.git" }, "keywords": [ "dear", @@ -25,9 +25,9 @@ "author": "AJ ONeal", "license": "Apache2", "bugs": { - "url": "https://github.com/DearDesi/desirae/issues" + "url": "https://git.daplie.com/Daplie/desirae/issues" }, - "homepage": "https://github.com/DearDesi/desirae", + "homepage": "https://git.daplie.com/Daplie/desirae", "dependencies": { "bluebird": "^2.5.3", "escape-string-regexp": "^1.0.2", From 447eccb9ff0d3f70fdfbc1575e8e23320ea2827b Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 7 Apr 2017 01:46:45 -0600 Subject: [PATCH 4/4] v0.11.2 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 24c015a..4b75d79 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "desirae", - "version": "0.11.1", + "version": "0.11.2", "authors": [ "AJ ONeal " ], diff --git a/package.json b/package.json index b2a3ca4..4701f08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "desirae", - "version": "0.11.1", + "version": "0.11.2", "description": "An in-browser static blog library and static site generator. Similar to Jekyll, Octopress, Nanoc, etc", "main": "desirae.js", "scripts": {