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

fix when base_path is / (in production)

This commit is contained in:
AJ ONeal 2015-01-13 15:24:41 -07:00
parent 4b71063637
commit c68e9aaf18
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desirae.js
View File

@ -717,7 +717,9 @@
, posts: { collated: view.desi.collated } , posts: { collated: view.desi.collated }
, urls: { , urls: {
base_url: view.env.base_url base_url: view.env.base_url
, base_path: view.env.base_path // /something -> good (leading slash)
// / -> bad (trailing slash)
, base_path: view.env.base_path.replace(/^\/$/, '')
} }
, data: { , data: {
author: { author: {
@ -895,7 +897,7 @@
if (/stylesheets.*\.css/.test(entity.path) && (!/google/.test(entity.path) || /obsid/.test(entity.path))) { if (/stylesheets.*\.css/.test(entity.path) && (!/google/.test(entity.path) || /obsid/.test(entity.path))) {
// TODO XXX move to a partial // TODO XXX move to a partial
desi.assets.push( desi.assets.push(
'<link href="' + env.base_path + '/themes/' + entity.path + '" type="text/css" rel="stylesheet" media="all">' '<link href="' + path.join(env.base_path, '/themes/', entity.path) + '" type="text/css" rel="stylesheet" media="all">'
); );
} }
} }
@ -916,8 +918,8 @@
// TODO nested names? // TODO nested names?
navigation.forEach(function (nav) { navigation.forEach(function (nav) {
nav.href = env.base_path + '/' + nav.name; nav.href = path.join(env.base_path, nav.name);
nav.path = env.base_path + '/' + nav.name; nav.path = path.join(env.base_path, nav.name);
// path.basename(nav.path, path.extname(nav.path)) // path.basename(nav.path, path.extname(nav.path))
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, '')) {