diff options
author | Johan Preynat <johan.preynat@gmail.com> | 2016-05-04 10:30:11 +0200 |
---|---|---|
committer | Johan Preynat <johan.preynat@gmail.com> | 2016-05-04 10:30:11 +0200 |
commit | ee8d35df7a26a130a48cdbddd55a26b354378682 (patch) | |
tree | c0a1d69d96f78db819dd27dc41b3be8b4f409ae2 | |
parent | be411cd5ff2d5bfc013bf2510cd1496ee343c09a (diff) | |
download | gitbook-ee8d35df7a26a130a48cdbddd55a26b354378682.zip gitbook-ee8d35df7a26a130a48cdbddd55a26b354378682.tar.gz gitbook-ee8d35df7a26a130a48cdbddd55a26b354378682.tar.bz2 |
Update Plugins.listResources() to use the prepared resources list
-rw-r--r-- | lib/output/website/onPage.js | 16 | ||||
-rw-r--r-- | lib/plugins/listResources.js | 8 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/output/website/onPage.js b/lib/output/website/onPage.js index 64b4e04..16a5c39 100644 --- a/lib/output/website/onPage.js +++ b/lib/output/website/onPage.js @@ -18,11 +18,15 @@ var fileToOutput = require('../helper/fileToOutput'); @param {Page} page */ function onPage(output, page) { - var options = output.getOptions(); - var file = page.getFile(); - var prefix = options.get('prefix'); - var book = output.getBook(); - var plugins = output.getPlugins(); + var options = output.getOptions(); + var prefix = options.get('prefix'); + + var file = page.getFile(); + + var book = output.getBook(); + var plugins = output.getPlugins(); + var state = output.getState(); + var resources = state.getResources(); var engine = createTemplateEngine(output, page.getPath()); @@ -38,7 +42,7 @@ function onPage(output, page) { // Generate the context var context = JSONUtils.encodeBookWithPage(output.getBook(), resultPage); context.plugins = { - resources: Plugins.listResources(plugins, prefix).toJS() + resources: Plugins.listResources(plugins, resources).toJS() }; context.template = { diff --git a/lib/plugins/listResources.js b/lib/plugins/listResources.js index 4a73a2c..fe31b5a 100644 --- a/lib/plugins/listResources.js +++ b/lib/plugins/listResources.js @@ -11,13 +11,13 @@ var PLUGIN_RESOURCES = require('../constants/pluginResources'); @param {String} type @return {Map<String:List<{url, path}>} */ -function listResources(plugins, type) { +function listResources(plugins, resources) { return plugins.reduce(function(result, plugin) { - var npmId = plugin.getNpmID(); - var resources = plugin.getResources(type); + var npmId = plugin.getNpmID(); + var pluginResources = resources.get(plugin.getName()); PLUGIN_RESOURCES.forEach(function(resourceType) { - var assets = resources.get(resourceType); + var assets = pluginResources.get(resourceType); if (!assets) return; var list = result.get(resourceType) || Immutable.List(); |