summaryrefslogtreecommitdiffstats
path: root/lib/configuration.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-03-14 23:23:28 +0100
committerSamy Pessé <samypesse@gmail.com>2015-03-14 23:23:28 +0100
commit94485621560152cf197dc8bd603774c46de2f0ef (patch)
tree189aa8349423187a807dd2c2a4b3639d1a752213 /lib/configuration.js
parent8320484b88f2481dad276b1912831110fdf75bcd (diff)
downloadgitbook-94485621560152cf197dc8bd603774c46de2f0ef.zip
gitbook-94485621560152cf197dc8bd603774c46de2f0ef.tar.gz
gitbook-94485621560152cf197dc8bd603774c46de2f0ef.tar.bz2
Add editorconfig and normalize indent
Diffstat (limited to 'lib/configuration.js')
-rw-r--r--lib/configuration.js12
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) {