Skip to content

Commit

Permalink
fix #142
Browse files Browse the repository at this point in the history
  • Loading branch information
2betop committed Aug 10, 2015
1 parent a325d93 commit 67cd32b
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion lib/compile.js
Expand Up @@ -668,8 +668,14 @@ function pipe(file, type, keep) {
if (typeof processor === 'function') {
var settings = {};
_.assign(settings, processor.defaultOptions || processor.options || {});
_.assign(settings, fis.config.env().get('settings.' + key, {}));
_.assign(settings, fis.media().get('settings.' + key, {}));
_.assign(settings, options || {});

// 删除隐藏配置
delete settings.__name;
delete settings.__plugin;
delete settings.__pos;

callback(processor, settings, key);
} else {
fis.log.warning('invalid processor [modules.' + key + ']');
Expand Down

0 comments on commit 67cd32b

Please sign in to comment.