diff options
| author | Chris Rebert <[email protected]> | 2013-09-18 23:44:56 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-09-18 23:44:56 -0700 |
| commit | abad169f4beff8f2ee1f49074eb2df82f477b5db (patch) | |
| tree | c1f395efa91ca09f2a120e02ad9bfab1d9da20c2 | |
| parent | 5deee652f927a0eebfceeea7d0584819bea0f766 (diff) | |
| parent | 0379c2056de96a9b17099d20d5e72228d9eef7bd (diff) | |
| download | bootstrap-abad169f4beff8f2ee1f49074eb2df82f477b5db.tar.xz bootstrap-abad169f4beff8f2ee1f49074eb2df82f477b5db.zip | |
Merge pull request #10710 from XhmikosR/patch-2
Patch 2
| -rw-r--r-- | Gruntfile.js | 5 | ||||
| -rw-r--r-- | assets/js/jszip.js | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 9fb641f34..ccb49ed52 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 +}; diff --git a/assets/js/jszip.js b/assets/js/jszip.js index 037818903..4be4e6a40 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: |