diff options
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/listBlocks.js | 3 | ||||
| -rw-r--r-- | lib/plugins/loadPlugin.js | 2 |
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 || {}) }); }) |