Merge pull request #418 from gruntjs/beautify-obj

Fix `beautify` when passed as an object.

Author: XhmikosR

Gruntfile.js

@@ -374,6 +374,18 @@ module.exports = function(grunt) {
           'tmp/mangle.js': ['test/fixtures/src/simple.js']
         },
         mangle: true
+      },
+      beautify_Object: {
+        files: {
+          'tmp/beautify.js': ['test/fixtures/src/localization.js', 'test/fixtures/src/simple.js']
+        },
+        options: {
+          beautify: {
+            'ascii_only': true,
+            'indent_start': 2,
+            'max_line_len': 40
+          }
+        }
       }
     },
 

tasks/lib/uglify.js

@@ -220,16 +220,6 @@ exports.init = function(grunt) {
       outputOptions.preamble = options.banner;
     }
 
-    if (options.beautify) {
-      if (_.isObject(options.beautify)) {
-        // beautify options sent as an object are merged
-        // with outputOptions and passed to the OutputStream
-        _.assign(outputOptions, options.beautify);
-      } else {
-        outputOptions.beautify = true;
-      }
-    }
-
     if (options.screwIE8) {
       outputOptions.screw_ie8 = true;
     }
@@ -277,6 +267,14 @@ exports.init = function(grunt) {
       outputOptions.comments = options.preserveComments;
     }
 
+    if (options.beautify) {
+      if (_.isObject(options.beautify)) {
+        _.assign(outputOptions, options.beautify);
+      } else {
+        outputOptions.beautify = true;
+      }
+    }
+
     return outputOptions;
   };
 

test/fixtures/expected/beautify.js

@@ -12,6 +12,7 @@ exports.contrib_uglify = {
   preuglified_files: function(test) {
 
     var files = [
+      'beautify.js',
       'comments.js',
       'compress.js',
       'compress_explicit.js',