summaryrefslogtreecommitdiffstats
path: root/lib/pluginslist.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-01-28 11:28:21 +0100
committerSamy Pessé <samypesse@gmail.com>2015-01-28 11:28:21 +0100
commit5539ab48a5e4cc5a94c692f62f2e9dc55d6a4e49 (patch)
tree7e734ec23986a35b6fc5c7af0d0d1bf0af47e7cf /lib/pluginslist.js
parentc25157fc4020d309910c1bb24bdc3b0dd8a03dc4 (diff)
downloadgitbook-5539ab48a5e4cc5a94c692f62f2e9dc55d6a4e49.zip
gitbook-5539ab48a5e4cc5a94c692f62f2e9dc55d6a4e49.tar.gz
gitbook-5539ab48a5e4cc5a94c692f62f2e9dc55d6a4e49.tar.bz2
Fix init of livereload plugin on serve
Diffstat (limited to 'lib/pluginslist.js')
-rw-r--r--lib/pluginslist.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pluginslist.js b/lib/pluginslist.js
index 0631922..35ba8c3 100644
--- a/lib/pluginslist.js
+++ b/lib/pluginslist.js
@@ -42,20 +42,19 @@ PluginsList.prototype.load = function(plugin, options) {
if (_.isArray(plugin)) {
return _.reduce(plugin, function(prev, p) {
- prev.then(function() {
+ return prev.then(function() {
return that.load(p);
});
}, Q());
}
- if (_.isString(plugin)) {
- plugin = new Plugin(this.book, plugin);
- }
+ if (_.isObject(plugin) && !(plugin instanceof Plugin)) plugin = plugin.name;
+ if (_.isString(plugin)) plugin = new Plugin(this.book, plugin);
that.log.info("load plugin", plugin.name, "....");
if (!plugin.isValid()) {
that.log.info.fail();
that.failed.push(plugin.name);
- return;
+ return Q();
} else {
that.log.info.ok();