From b741608964310cb6886474f3fac70ffc264189bb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 09:04:09 +0300 Subject: [PATCH 1/2] Show minification report for uglify-js. --- Gruntfile.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9fb641f34b..ccb49ed525 100644 --- a/Gruntfile.js +++ b/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 +}; From 0379c2056de96a9b17099d20d5e72228d9eef7bd Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 20:00:45 +0300 Subject: [PATCH 2/2] Update jszip.js to the latest git. --- assets/js/jszip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/jszip.js b/assets/js/jszip.js index 0378189038..4be4e6a40a 100644 --- a/assets/js/jszip.js +++ b/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: \ No newline at end of file +// vim: set shiftwidth=3 softtabstop=3: