Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change the grunt config for the issue #80 #81

Merged
merged 4 commits into from
Feb 1, 2014
Merged

change the grunt config for the issue #80 #81

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8703f4c
separate attribution comment & use "/*!" for it
cvrebert Jan 14, 2014
54825b7
Merge branch 'patch-1' of https://github.com/cvrebert/jszip into cvre…
dduponchel Jan 15, 2014
023cdbf
change the grunt config for the issue #80
dduponchel Jan 15, 2014
8411a16
Remove the "usage" block from the license
dduponchel Jan 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,19 @@ module.exports = function(grunt) {
},
options: {
standalone: 'JSZip',
ignore:['./lib/nodeBuffer.js','./lib/nodeBufferReader']
ignore:['./lib/nodeBuffer.js','./lib/nodeBufferReader'],
postBundleCB: function(err, src, done) {
var license = require('fs').readFileSync('lib/license_header.js');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how the browserify task works, but you might be able to use the banner option that grunt-uglify (and some other Grunt tasks) offer instead of doing this yourself.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't use the banner option from uglify because I would like the header in the not-minified file. Browserify doesn't seem to have this option (grunt-browserify doesn't expose one either) and erase the file before each run. That's why I prepended the license with the postBundleCB. If you find a better way to include it, I'd love to use it :)

done(err, license + src);
}
}
}
},
uglify: {
options: {
report: 'gzip',
mangle: true
mangle: true,
preserveComments: 'some'
},
all: {
src: 'dist/jszip.js',
Expand Down
19 changes: 0 additions & 19 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
'use strict';
/**

JSZip - A Javascript class for generating and reading zip files
<http://stuartk.com/jszip>

(c) 2009-2012 Stuart Knightley <stuart [at] stuartk.com>
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.

Usage:
zip = new JSZip();
zip.file("hello.txt", "Hello, World!").file("tempfile", "nothing");
zip.folder("images").file("smile.gif", base64Data, {base64: true});
zip.file("Xmas.txt", "Ho ho ho !", {date : new Date("December 25, 2007 00:00:01")});
zip.remove("tempfile");

base64zip = zip.generate();

**/

/**
* Representation a of zip file in js
* @constructor
Expand Down
19 changes: 19 additions & 0 deletions lib/license_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*!

JSZip - A Javascript class for generating and reading zip files
<http://stuartk.com/jszip>

(c) 2009-2012 Stuart Knightley <stuart [at] stuartk.com>
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
*/
/**
Usage:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is more docs than license, so IMHO it doesn't make sense to have it in license_header.js.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, I moved too many lines

zip = new JSZip();
zip.file("hello.txt", "Hello, World!").file("tempfile", "nothing");
zip.folder("images").file("smile.gif", base64Data, {base64: true});
zip.file("Xmas.txt", "Ho ho ho !", {date : new Date("December 25, 2007 00:00:01")});
zip.remove("tempfile");

base64zip = zip.generate();

**/