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

Merge branch 'master' into month_name

This commit is contained in:
AJ ONeal 2017-05-18 15:28:17 -05:00
parent 7c10a5e993 447eccb9ff
commit 11484146e9
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "desirae", "name": "desirae",
"version": "0.11.1", "version": "0.11.2",
"authors": [ "authors": [
"AJ ONeal <awesome@coolaj86.com>" "AJ ONeal <awesome@coolaj86.com>"
], ],

4
desirae.js
View File

@ -267,6 +267,10 @@
if (!themename) { if (!themename) {
themename = desi.site.theme || desi.config.theme; 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 // TODO NO DEFAULTS
if ('__page__' === layoutname) { if ('__page__' === layoutname) {

5
lib/utils.js
View File

@ -78,7 +78,10 @@
console.error(file); 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]) { if (!obj[keyname][filename]) {
obj[keyname][filename] = {}; obj[keyname][filename] = {};

8
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "desirae", "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", "description": "An in-browser static blog library and static site generator. Similar to Jekyll, Octopress, Nanoc, etc",
"main": "desirae.js", "main": "desirae.js",
"scripts": { "scripts": {
@ -8,7 +8,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:DearDesi/desirae.git" "url": "git@git.daplie.com:Daplie/desirae.git"
}, },
"keywords": [ "keywords": [
"dear", "dear",
@ -25,9 +25,9 @@
"author": "AJ ONeal", "author": "AJ ONeal",
"license": "Apache2", "license": "Apache2",
"bugs": { "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": { "dependencies": {
"bluebird": "^2.5.3", "bluebird": "^2.5.3",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "^1.0.2",