Skip to content

Commit

Permalink
Merge pull request #2 from kangax/master
Browse files Browse the repository at this point in the history
Sync to master
  • Loading branch information
asturur committed Apr 24, 2015
2 parents ef1036b + a85a6ac commit 2c52ee8
Show file tree
Hide file tree
Showing 44 changed files with 11,186 additions and 23,374 deletions.
31 changes: 31 additions & 0 deletions .jshintrc_tests
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"globals": {
"fabric": true,
"G_vmlCanvasManager": true
},
"browser": true,
// TODO: change to true
"eqeqeq": false,
"eqnull": true,
"evil": true,
"expr": true,
"forin": false,
"immed": true,
"lastsemic": true,
"laxbreak": true,
"loopfunc": true,
"multistr": true,
"newcap": true,
"noarg": true,
"node": true,
"noempty": false,
"nomen": false,
"nonew": false,
"onevar": false,
"plusplus": false,
"strict": false,
"sub": true,
"undef": true,
"unused": true,
"qunit": true
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Follow [@fabric.js](http://twitter.com/fabricjs) or [@kangax](http://twitter.com

Questions, suggestions — [fabric.js on Google Groups](http://groups.google.com/group/fabricjs).

See [Fabric questions on Stackoverflow](stackoverflow.com/questions/tagged/fabricjs),
See [Fabric questions on Stackoverflow](http://stackoverflow.com/questions/tagged/fabricjs),
Fabric snippets on [jsfiddle](http://jsfiddle.net/user/fabricjs/fiddles/)
or [codepen.io](http://codepen.io/tag/fabricjs).

Expand Down
2 changes: 1 addition & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ else if (minifier === 'closure') {
mininfierCmd = 'java -jar ' + rootPath + '/lib/google_closure_compiler.jar --js fabric.js --js_output_file fabric.min.js' + sourceMapFlags;
}
else if (minifier === 'uglifyjs') {
mininfierCmd = 'uglifyjs ' + amdUglifyFlags + ' --output fabric.min.js fabric.js' + sourceMapFlags;
mininfierCmd = 'uglifyjs ' + amdUglifyFlags + ' --compress --mangle --output fabric.min.js fabric.js' + sourceMapFlags;
}

var buildSh = 'build-sh' in buildArgsAsObject;
Expand Down
2 changes: 1 addition & 1 deletion dist/fabric.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* build: `node build.js modules=ALL exclude=gestures,json minifier=uglifyjs` */
/* build: `node build.js modules=ALL exclude=json,gestures minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */

var fabric = fabric || { version: "1.5.0" };
Expand Down
22 changes: 15 additions & 7 deletions dist/fabric.min.js

Large diffs are not rendered by default.

Binary file modified dist/fabric.min.js.gz
Binary file not shown.
Loading

0 comments on commit 2c52ee8

Please sign in to comment.