Merge branch 'master' of https://github.com/vibornoff/grunt-contrib-u…

…glify into fix-screw-ie8-option-crash
gruntjs · Dec 16, 2015 · 71bf6f5 · 71bf6f5
2 parents be7de43 + 12c7ded
commit 71bf6f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/tasks/lib/uglify.js b/tasks/lib/uglify.js
@@ -88,6 +88,9 @@ exports.init = function(grunt) {
       if (options.compress.warnings !== true) {
         options.compress.warnings = false;
       }
+      if (options.screwIE8) {
+        options.compress.screw_ie8 = true;
+      }
       var compressor = UglifyJS.Compressor(options.compress);
       topLevel = topLevel.transform(compressor);
 
@@ -134,6 +137,12 @@ exports.init = function(grunt) {
     }
 
     if (options.mangle !== false) {
+      if (options.mangle === true) {
+        options.mangle = {};
+      }
+      if (options.screwIE8) {
+        options.mangle.screw_ie8 = true;
+      }
       // disabled due to:
       //   1) preserve stable name mangling
       //   2) it increases gzipped file size, see https://github.com/mishoo/UglifyJS2#mangler-options

diff --git a/tasks/uglify.js b/tasks/uglify.js
@@ -128,11 +128,6 @@ module.exports = function(grunt) {
         options.destToSourceMap = destToSourceMapPath + sourceMapBasename;
       }
 
-      if (options.screwIE8) {
-        if (options.mangle) { options.mangle.screw_ie8 = true; }
-        if (options.compress) { options.compress.screw_ie8 = true; }
-      }
-
       // Minify files, warn and fail on error.
       var result;
       try {