diff options
| author | Mark Otto <otto@github.com> | 2013-09-20 07:57:11 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-09-20 07:57:11 +0400 |
| commit | e148923f2764d0af6f7d6fb1b601840d241759b5 (patch) | |
| tree | 7831543c9b205eb0d184f2eb3187fb2cd3873110 /assets/js | |
| parent | ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff) | |
| parent | 22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff) | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'assets/js')
| -rw-r--r-- | assets/js/jszip.js | 4 |
1 files 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: |