Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-02 19:14:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fabric.Object#cloneAsImage on node. Closes #336. Version 0.9.34

Browse source
This commit is contained in:
kangax 2012-12-20 19:49:39 +01:00
parent f0d2235053
commit 882d7085d8
7 changed files with 49 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HEADER.js
View file

@ -1,6 +1,6 @@
/*! Fabric.js Copyright 2008-2012, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "0.9.33" };
var fabric = fabric || { version: "0.9.34" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;

13
dist/all.js vendored
View file

@ -1,7 +1,7 @@
/* build: `node build.js modules=ALL` */
/*! Fabric.js Copyright 2008-2012, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "0.9.33" };
var fabric = fabric || { version: "0.9.34" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
@ -8460,6 +8460,17 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
return;
}
var Image = global.Image;
try {
var NodeImage = require('canvas').Image;
if (NodeImage) {
Image = NodeImage;
}
}
catch(err) {
fabric.log(err);
}
/**
* Root object class from which all 2d shape classes inherit from
* @class Object

8
dist/all.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/all.min.js.gz vendored
View file

Binary file not shown.

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "fabric",
"description": "Object model for HTML5 canvas, and SVG-to-canvas parser. Backed by jsdom and node-canvas.",
"version": "0.9.33",
"version": "0.9.34",
"author": "Juriy Zaytsev <kangax@gmail.com>",
"keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"],
"repository": "git://github.com/kangax/fabric.js",

11
src/object.class.js
View file

@ -13,6 +13,17 @@
return;
}
var Image = global.Image;
try {
var NodeImage = require('canvas').Image;
if (NodeImage) {
Image = NodeImage;
}
}
catch(err) {
fabric.log(err);
}
/**
* Root object class from which all 2d shape classes inherit from
* @class Object

40
test/unit/object.js
View file

@ -415,30 +415,30 @@
equal(cObj.getAngle(), 0);
});
// asyncTest('cloneAsImage', function() {
// var cObj = new fabric.Rect({ width: 100, height: 100, fill: 'red' });
asyncTest('cloneAsImage', function() {
var cObj = new fabric.Rect({ width: 100, height: 100, fill: 'red' });
// ok(typeof cObj.cloneAsImage == 'function');
ok(typeof cObj.cloneAsImage == 'function');
// if (!fabric.Canvas.supports('toDataURL')) {
// //alert('`toDataURL` is not supported by this environment; skipping `cloneAsImage` test (as it relies on `toDataURL`)');
// start();
// }
// else {
// var image;
// var _this = this;
if (!fabric.Canvas.supports('toDataURL')) {
fabric.log('`toDataURL` is not supported by this environment; skipping `cloneAsImage` test (as it relies on `toDataURL`)');
start();
}
else {
var image;
var _this = this;
// setTimeout(function() {
// ok(image);
// ok(image instanceof fabric.Image);
// start();
// }, 500);
setTimeout(function() {
ok(image);
ok(image instanceof fabric.Image);
start();
}, 500);
// cObj.cloneAsImage(function(i) {
// image = i;
// });
// }
// });
cObj.cloneAsImage(function(i) {
image = i;
});
}
});
asyncTest('toDataURL', function() {
var data =