rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #10710 from XhmikosR/patch-2

Browse Source 
Patch 2
This commit is contained in:
Chris Rebert 2013-09-18 23:44:56 -07:00
commit abad169f4b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gruntfile.js
View File

@ -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 %>'],
@ -217,4 +218,4 @@ module.exports = function(grunt) {
var files = getFiles('js') + getFiles('less') + getFiles('fonts') var files = getFiles('js') + getFiles('less') + getFiles('fonts')
fs.writeFileSync('assets/js/raw-files.js', files) fs.writeFileSync('assets/js/raw-files.js', files)
}); });
}; };

4
assets/js/jszip.js
View File

@ -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 !");
@ -1422,4 +1422,4 @@ JSZip.base64 = (function() {
}()); }());
// enforcing Stuk's coding style // enforcing Stuk's coding style
// vim: set shiftwidth=3 softtabstop=3: // vim: set shiftwidth=3 softtabstop=3: