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

Fix loadFromJSON not invoking callback. Closes #184.

Browse source
This commit is contained in:
kangax 2012-06-25 15:27:10 +02:00
parent 4dcf268d67
commit 30f24f7f35
6 changed files with 15 additions and 29 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, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "0.8.25" };
var fabric = fabric || { version: "0.8.26" };
if (typeof exports != 'undefined') {
exports.fabric = fabric;

19
dist/all.js vendored
View file

@ -1,7 +1,7 @@
/* build: `node build.js modules=ALL` */
/*! Fabric.js Copyright 2008-2012, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "0.8.25" };
var fabric = fabric || { version: "0.8.26" };
if (typeof exports != 'undefined') {
exports.fabric = fabric;
@ -7134,9 +7134,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
_this.backgroundImageOpacity = serialized.backgroundImageOpacity;
_this.backgroundImageStretch = serialized.backgroundImageStretch;
}
if (callback) {
callback();
}
callback && callback();
});
return this;
@ -7153,6 +7151,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
enlivenedObjects.forEach(function(obj, index) {
_this.insertAt(obj, index, true);
});
callback && callback();
});
},
@ -7190,9 +7189,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
var data = JSON.stringify(this);
this.cloneWithoutData(function(clone) {
clone.loadFromJSON(data, function() {
if (callback) {
callback(clone);
}
callback && callback(clone);
});
});
},
@ -7215,17 +7212,13 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
if (this.backgroundImage) {
clone.setBackgroundImage(this.backgroundImage.src, function() {
clone.renderAll();
if (callback) {
callback(clone);
}
callback && callback(clone);
});
clone.backgroundImageOpacity = this.backgroundImageOpacity;
clone.backgroundImageStretch = this.backgroundImageStretch;
}
else {
if (callback) {
callback(clone);
}
callback && callback(clone);
}
}
});

4
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.8.25",
"version": "0.8.26",
"author": "Juriy Zaytsev <kangax@gmail.com>",
"keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"],
"repository": "git://github.com/kangax/fabric.js",

17
src/canvas.serialization.js
View file

@ -164,9 +164,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
_this.backgroundImageOpacity = serialized.backgroundImageOpacity;
_this.backgroundImageStretch = serialized.backgroundImageStretch;
}
if (callback) {
callback();
}
callback && callback();
});
return this;
@ -183,6 +181,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
enlivenedObjects.forEach(function(obj, index) {
_this.insertAt(obj, index, true);
});
callback && callback();
});
},
@ -220,9 +219,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
var data = JSON.stringify(this);
this.cloneWithoutData(function(clone) {
clone.loadFromJSON(data, function() {
if (callback) {
callback(clone);
}
callback && callback(clone);
});
});
},
@ -245,17 +242,13 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
if (this.backgroundImage) {
clone.setBackgroundImage(this.backgroundImage.src, function() {
clone.renderAll();
if (callback) {
callback(clone);
}
callback && callback(clone);
});
clone.backgroundImageOpacity = this.backgroundImageOpacity;
clone.backgroundImageStretch = this.backgroundImageStretch;
}
else {
if (callback) {
callback(clone);
}
callback && callback(clone);
}
}
});