Skip to content

Commit c89dbff

Browse files
committed
Merge pull request #9 from Abhra1992/abhra-fix-data
Fixing data loading, data availability and partial loading
2 parents 4330051 + cbe634d commit c89dbff

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

lib/loadData.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ module.exports = function(dir) {
2323
data = yaml.safeLoad(fs.readFileSync(dataFiles[i]));
2424
}
2525

26-
this.data = data;
26+
this.data[name] = data;
2727
}
2828
}

lib/loadPartials.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ module.exports = function(dir) {
1010
var partials = glob.sync(path.join(dir, '**/*.{html,hbs,handlebars}'));
1111

1212
for (var i in partials) {
13+
var ext = path.extname(partials[i]);
1314
var file = fs.readFileSync(partials[i]);
14-
var name = path.basename(partials[i], '.html');
15+
var name = path.basename(partials[i], ext);
1516
this.Handlebars.registerPartial(name, file.toString() + '\n');
1617
}
1718
}

lib/render.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ module.exports = function(file, enc, cb) {
3232
pageData = page.attributes;
3333
pageData = extend(pageData, {
3434
page: path.basename(file.path, '.html'),
35-
root: processRoot(file.path, this.options.root)
35+
root: processRoot(file.path, this.options.root),
36+
data: this.data
3637
});
3738

3839
// Add special ad-hoc partials for #ifpage and #unlesspage

0 commit comments

Comments
 (0)