Update Plugins.listResources() to use the prepared resources list

This commit is contained in:
Johan Preynat
2016-05-04 10:30:11 +02:00
parent be411cd5ff
commit ee8d35df7a
2 changed files with 14 additions and 10 deletions
+10 -6
View File
@@ -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 = {
+4 -4
View File
@@ -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();