summaryrefslogtreecommitdiffstats
path: root/lib/plugin.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-01-30 16:53:38 +0100
committerSamy Pessé <samypesse@gmail.com>2015-01-30 16:53:42 +0100
commitd7caf6686e4574472f6648bc9409476059571490 (patch)
tree39693515464b95b8cde7fffd409146d9adb8960f /lib/plugin.js
parent71dad602ec68a105762eff102dba12a98a40a1b1 (diff)
downloadgitbook-d7caf6686e4574472f6648bc9409476059571490.zip
gitbook-d7caf6686e4574472f6648bc9409476059571490.tar.gz
gitbook-d7caf6686e4574472f6648bc9409476059571490.tar.bz2
Fix namespacing of plugins resources
Diffstat (limited to 'lib/plugin.js')
-rw-r--r--lib/plugin.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/plugin.js b/lib/plugin.js
index 995385a..ff35a3f 100644
--- a/lib/plugin.js
+++ b/lib/plugin.js
@@ -68,9 +68,12 @@ Plugin.prototype.normalizeResource = function(resource) {
// Return resources
Plugin.prototype._getResources = function(base) {
- base = base || "book";
+ base = base;
var book = this.infos[base];
+ // Compatibility with version 1.x.x
+ if (base == "website") book = book || this.infos["book"];
+
// Nothing specified, fallback to default
if (!book) {
return Q({});
@@ -156,13 +159,10 @@ Plugin.prototype.callHook = function(name, data) {
};
// Copy plugin assets fodler
-Plugin.prototype.copyAssets = function(out, options) {
+Plugin.prototype.copyAssets = function(out, base) {
var that = this;
- options = _.defaults(options || {}, {
- base: "book"
- });
- return this.getResources(options.base)
+ return this.getResources(base)
.get('assets')
.then(function(assets) {
// Assets are undefined