summaryrefslogtreecommitdiffstats
path: root/lib/plugins
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-05-01 19:35:50 +0200
committerSamy Pesse <samypesse@gmail.com>2016-05-01 19:35:50 +0200
commit3a48435497a0d00d97c9524ea71fe42f99851205 (patch)
tree1f03da56da2ee631a534a7835fdf90e1f5fb2bf6 /lib/plugins
parent084925de8b0fb820796b5ce60bffdd708c7dad67 (diff)
downloadgitbook-3a48435497a0d00d97c9524ea71fe42f99851205.zip
gitbook-3a48435497a0d00d97c9524ea71fe42f99851205.tar.gz
gitbook-3a48435497a0d00d97c9524ea71fe42f99851205.tar.bz2
Cleanup folder before generating output
Diffstat (limited to 'lib/plugins')
-rw-r--r--lib/plugins/listBlocks.js3
-rw-r--r--lib/plugins/loadPlugin.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/plugins/listBlocks.js b/lib/plugins/listBlocks.js
index f738937..3ac28af 100644
--- a/lib/plugins/listBlocks.js
+++ b/lib/plugins/listBlocks.js
@@ -10,7 +10,8 @@ function listBlocks(plugins) {
return plugins
.reverse()
.reduce(function(result, plugin) {
- return result.merge(plugin.getBlocks());
+ var blocks = plugin.getBlocks();
+ return result.merge(blocks);
}, Immutable.Map());
}
diff --git a/lib/plugins/loadPlugin.js b/lib/plugins/loadPlugin.js
index 276d201..9ed83a1 100644
--- a/lib/plugins/loadPlugin.js
+++ b/lib/plugins/loadPlugin.js
@@ -73,7 +73,7 @@ function loadPlugin(book, plugin) {
// Update plugin
return plugin.merge({
'package': Immutable.fromJS(packageContent),
- 'content': Immutable.fromJS(content)
+ 'content': Immutable.fromJS(content || {})
});
})