Add uglifyjs as dev dependency. Fix compressing script.

This commit is contained in:
kangax 2012-10-17 11:19:41 +02:00
parent ed0c958b13
commit 79f1b47063
5 changed files with 18 additions and 11 deletions

View file

@ -24,7 +24,7 @@ else if (minifier === 'closure') {
mininfierCmd = 'java -jar lib/google_closure_compiler.jar --js dist/all.js --js_output_file dist/all.min.js';
}
else if (minifier === 'uglifyjs') {
mininfierCmd = 'uglifyjs dist/all.js --o dist/all.min.js';
mininfierCmd = 'uglifyjs -o dist/all.min.js dist/all.js';
}
var includeAllModules = modulesToInclude.length === 1 && modulesToInclude[0] === 'ALL';

12
dist/all.js vendored
View file

@ -5936,7 +5936,7 @@ fabric.util.string = {
EMPTY_JSON: '{"objects": [], "background": "white"}',
/**
* Takes <canvas> element and transforms its data in such way that it becomes grayscale
* Takes &lt;canvas> element and transforms its data in such way that it becomes grayscale
* @static
* @method toGrayscale
* @param {HTMLCanvasElement} canvasEl
@ -10000,18 +10000,21 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
fabric.Rect = fabric.util.createClass(fabric.Object, /** @scope fabric.Rect.prototype */ {
/**
* Type of the instance
* @property
* @type String
*/
type: 'rect',
/**
* Horizontal border radius
* @property
* @type Number
*/
rx: 0,
/**
* Vertical border radius
* @property
* @type Number
*/
@ -10104,7 +10107,11 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
}
},
// since our coordinate system differs from that of SVG
/**
* @method _normalizeLeftTopProperties
* @private
* Since coordinate system differs from that of SVG
*/
_normalizeLeftTopProperties: function(parsedAttributes) {
if (parsedAttributes.left) {
this.set('left', parsedAttributes.left + this.getWidth() / 2);
@ -10118,6 +10125,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
},
/**
* Returns complexity of an instance
* @method complexity
* @return {Number} complexity
*/

12
dist/all.min.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/all.min.js.gz vendored

Binary file not shown.

View file

@ -20,7 +20,8 @@
},
"devDependencies": {
"qunit": "0.5.x",
"jshint": "0.9.x"
"jshint": "0.9.x",
"uglify-js": "1.3.x"
},
"engines": { "node": ">=0.4.0 && <0.9.0" },
"main": "./dist/all.js"