Commit abad169f authored by Chris Rebert's avatar Chris Rebert

Merge pull request #10710 from XhmikosR/patch-2

Patch 2
parents 5deee652 0379c205
...@@ -63,7 +63,8 @@ module.exports = function(grunt) { ...@@ -63,7 +63,8 @@ module.exports = function(grunt) {
uglify: { uglify: {
options: { options: {
banner: '<%= banner %>' banner: '<%= banner %>',
report: 'min'
}, },
bootstrap: { bootstrap: {
src: ['<%= concat.bootstrap.dest %>'], src: ['<%= concat.bootstrap.dest %>'],
......
...@@ -659,7 +659,7 @@ JSZip.prototype = (function () { ...@@ -659,7 +659,7 @@ JSZip.prototype = (function () {
if ( !this.files.hasOwnProperty(name) ) { continue; } if ( !this.files.hasOwnProperty(name) ) { continue; }
var file = this.files[name]; 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]; var compression = JSZip.compressions[compressionName];
if (!compression) { if (!compression) {
throw new Error(compressionName + " is not a valid compression method !"); throw new Error(compressionName + " is not a valid compression method !");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment