diff options
Diffstat (limited to 'lib/configuration.js')
| -rw-r--r-- | lib/configuration.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/configuration.js b/lib/configuration.js index 578f4e2..cc342c5 100644 --- a/lib/configuration.js +++ b/lib/configuration.js @@ -64,10 +64,10 @@ function normalizePluginsNames(plugins) { var Configuration = function(book, options) { var that = this; - this.book = book; + this.book = book; this.options = _.cloneDeep(Configuration.DEFAULT); - this.options = _.merge(this.options, options || {}); + this.options = _.merge(this.options, options || {}); // options.input == book.root Object.defineProperty(this.options, "input", { @@ -79,15 +79,15 @@ var Configuration = function(book, options) { // Read and parse the configuration Configuration.prototype.load = function() { - var that = this; + var that = this; - return Q() + return Q() .then(function() { try { var _config = require(path.resolve(that.book.root, that.options.configFile)); that.options = _.merge( - that.options, - _.omit(_config, 'configFile', 'defaultsPlugins', 'generator', 'extension') + that.options, + _.omit(_config, 'configFile', 'defaultsPlugins', 'generator', 'extension') ); } catch(err) { |