Merge c7bb60cab0 into 94205c3a37
This commit is contained in:
commit
55027c6ee9
|
|
@ -106,7 +106,7 @@ exports.minify = function(files, options) {
|
||||||
// 4. output
|
// 4. output
|
||||||
var inMap = options.inSourceMap;
|
var inMap = options.inSourceMap;
|
||||||
var output = {};
|
var output = {};
|
||||||
if (typeof options.inSourceMap == "string") {
|
if (typeof options.inSourceMap == "string" && !options.inSourceMapFromString) {
|
||||||
inMap = fs.readFileSync(options.inSourceMap, "utf8");
|
inMap = fs.readFileSync(options.inSourceMap, "utf8");
|
||||||
}
|
}
|
||||||
if (options.outSourceMap) {
|
if (options.outSourceMap) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user