summaryrefslogtreecommitdiffstats
path: root/lib/output/base.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2016-02-25 14:17:31 +0100
committerSamy Pessé <samypesse@gmail.com>2016-02-25 14:17:31 +0100
commit9215edc0a08e909763bae67ce7babb46fe655a4d (patch)
tree3797f331793a76b838b8e04777472676b63d3ecc /lib/output/base.js
parent25ae21dae35e42268be28d9efa7f8175841c7dcc (diff)
downloadgitbook-9215edc0a08e909763bae67ce7babb46fe655a4d.zip
gitbook-9215edc0a08e909763bae67ce7babb46fe655a4d.tar.gz
gitbook-9215edc0a08e909763bae67ce7babb46fe655a4d.tar.bz2
Remove option defaultPlugins and simplify loading
Diffstat (limited to 'lib/output/base.js')
-rw-r--r--lib/output/base.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/output/base.js b/lib/output/base.js
index 025e850..a1d8804 100644
--- a/lib/output/base.js
+++ b/lib/output/base.js
@@ -27,11 +27,7 @@ function Output(book, opts, parent) {
this.log = this.book.log;
// Create plugins manager
- if (this.parent) {
- this.plugins = this.parent.plugins;
- } else {
- this.plugins = new PluginsManager(this.book);
- }
+ this.plugins = new PluginsManager(this.book);
// Create template engine
this.template = new TemplateEngine(this);
@@ -52,7 +48,7 @@ Output.prototype.generate = function() {
// Load all plugins
.then(function() {
- return Promise(that.parent? null: that.plugins.loadAll())
+ return that.plugins.loadAll()
.then(function() {
that.template.addFilters(that.plugins.getFilters());
that.template.addBlocks(that.plugins.getBlocks());