Merge pull request #10710 from XhmikosR/patch-2

Patch 2

Gruntfile.js

@@ -63,7 +63,8 @@ module.exports = function(grunt) {
 
     uglify: {
       options: {
-        banner: '<%= banner %>'
+        banner: '<%= banner %>',
+        report: 'min'
       },
       bootstrap: {
         src: ['<%= concat.bootstrap.dest %>'],
@@ -217,4 +218,4 @@ module.exports = function(grunt) {
     var files = getFiles('js') + getFiles('less') + getFiles('fonts')
     fs.writeFileSync('assets/js/raw-files.js', files)
   });
-};
+};
\ No newline at end of file

assets/js/jszip.js

@@ -659,7 +659,7 @@ JSZip.prototype = (function () {
             if ( !this.files.hasOwnProperty(name) ) { continue; }
             var file = this.files[name];
 
-            var compressionName = file.compression || options.compression.toUpperCase();
+            var compressionName = file.options.compression || options.compression.toUpperCase();
             var compression = JSZip.compressions[compressionName];
             if (!compression) {
                throw new Error(compressionName + " is not a valid compression method !");
@@ -1422,4 +1422,4 @@ JSZip.base64 = (function() {
 }());
 
 // enforcing Stuk's coding style
-// vim: set shiftwidth=3 softtabstop=3:
+// vim: set shiftwidth=3 softtabstop=3:
\ No newline at end of file