diff options
author | Samy Pessé <samypesse@gmail.com> | 2016-02-17 11:52:31 +0100 |
---|---|---|
committer | Samy Pessé <samypesse@gmail.com> | 2016-02-17 11:52:31 +0100 |
commit | 7c575e1b43d75a22bad035a3ce62110572dff1c9 (patch) | |
tree | 83b31c05128a470b646114fe2d7671c89e6c31d3 /lib/config/index.js | |
parent | c89c253f294df6820eeea6f50ec98dcd672ec8d3 (diff) | |
download | gitbook-7c575e1b43d75a22bad035a3ce62110572dff1c9.zip gitbook-7c575e1b43d75a22bad035a3ce62110572dff1c9.tar.gz gitbook-7c575e1b43d75a22bad035a3ce62110572dff1c9.tar.bz2 |
Fix loading of plugins
Diffstat (limited to 'lib/config/index.js')
-rw-r--r-- | lib/config/index.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/config/index.js b/lib/config/index.js index 801dca1..ede45ba 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -2,8 +2,9 @@ var _ = require('lodash'); var semver = require('semver'); var gitbook = require('../gitbook'); -var configDefault = require('./default'); var Promise = require('../utils/promise'); +var configDefault = require('./default'); +var plugins = require('./plugins'); // Config files to tested (sorted) var CONFIG_FILES = [ @@ -56,10 +57,10 @@ Config.prototype.load = function() { } that.options.output = that.options.output || that.book.resolve('_book'); - //that.options.plugins = normalizePluginsList(that.options.plugins); - //that.options.defaultsPlugins = normalizePluginsList(that.options.defaultsPlugins || '', false); - //that.options.plugins = _.union(that.options.plugins, that.options.defaultsPlugins); - //that.options.plugins = _.uniq(that.options.plugins, 'name'); + that.options.plugins = plugins.toList(that.options.plugins); + that.options.defaultsPlugins = plugins.toList(that.options.defaultsPlugins || '', false); + that.options.plugins = _.union(that.options.plugins, that.options.defaultsPlugins); + that.options.plugins = _.uniq(that.options.plugins, 'name'); // Default value for text direction (from language) /*if (!that.options.direction) { |