summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--lib/book.js2
-rw-r--r--lib/configuration.js4
-rw-r--r--lib/plugin.js2
-rw-r--r--lib/utils/watch.js1
5 files changed, 8 insertions, 3 deletions
diff --git a/README.md b/README.md
index 407a7f5..ab30993 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ $ gitbook build
* [AsciiDoc Support](http://help.gitbook.com/format/asciidoc.html)
* [Variables and Templating](http://help.gitbook.com/format/templating.html)
* [Content References](http://help.gitbook.com/format/conrefs.html)
-* [Plugins](http://help.gitbook.com/plugins/index.html)
+* [Plugins](http://help.gitbook.com/format/plugins.html)
* Interractive reader website:
* Search
* Font Settings (Serif, Sans Serif)
diff --git a/lib/book.js b/lib/book.js
index 2e0ab58..b306c51 100644
--- a/lib/book.js
+++ b/lib/book.js
@@ -512,7 +512,7 @@ Book.prototype.parsePage = function(filename, options) {
var interpolate = function(fn) {
return Q(fn(page))
.then(function(_page) {
- page = _page;
+ page = _page || page;
});
};
diff --git a/lib/configuration.js b/lib/configuration.js
index 9e839e6..f510918 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -156,6 +156,10 @@ Configuration.prototype.normalizeLanguage = function() {
return i18n.normalizeLanguage(this.options.language);
};
+// Return a configuration
+Configuration.prototype.get = function(key, def) {
+ return _.get(this.options, key, def);
+};
// Default configuration
Configuration.DEFAULT = {
diff --git a/lib/plugin.js b/lib/plugin.js
index a7a29b9..364aec8 100644
--- a/lib/plugin.js
+++ b/lib/plugin.js
@@ -33,7 +33,7 @@ var Plugin = function(book, name) {
// Type of plugins resources
Plugin.RESOURCES = ["js", "css"];
Plugin.HOOKS = [
- "init", "finish", "finish:before"
+ "init", "finish", "finish:before", "page", "page:before"
]
// Load from a name
diff --git a/lib/utils/watch.js b/lib/utils/watch.js
index b6e18e7..3e73e47 100644
--- a/lib/utils/watch.js
+++ b/lib/utils/watch.js
@@ -19,6 +19,7 @@ function watch(dir) {
var watcher = chokidar.watch(toWatch, {
cwd: dir,
+ ignored: '_book/**',
ignoreInitial: true
});