Merge 938df1b024 into b5a7197ae5

2016-01-23 09:31:04 +00:00 · 2016-01-23 09:31:04 +00:00 · 1f88ea0cc8
commit 1f88ea0cc8
parent b5a7197ae5 938df1b024
1 changed files with 7 additions and 4 deletions
--- a/tools/node.js
+++ b/tools/node.js
@ -54,12 +54,15 @@ exports.minify = function(files, options) {
        if (typeof files == "string")
            files = [ files ];
        files.forEach(function(file, i){
+            var filename = options.fromString
+                ? (typeof file === 'object' ? file.filename : i)
+                : file;
            var code = options.fromString
-                ? file
-                : fs.readFileSync(file, "utf8");
-            sourcesContent[file] = code;
+                ? (typeof file === 'object' ? file.content : file)
+                : fs.readFileSync(filename, "utf8");
+            sourcesContent[filename] = code;
            toplevel = UglifyJS.parse(code, {
-                filename: options.fromString ? i : file,
+                filename: filename,
                toplevel: toplevel
            });
        });