Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-22 15:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Loading data from json (via loadFromJSON rather than loadFromDatalessJSON) should preserve z-index order of objects

Browse source 
(but ideally, we need to get rid of duplication in `loadFromJSON` and `loadFromDatalessJSON`).
This commit is contained in:
kangax 2010-08-30 19:11:14 -04:00
parent fea32f32a0
commit eba95c6ee7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/element.class.js
View file

@ -1541,13 +1541,13 @@
_enlivenObjects: function (objects, callback) {
var numLoadedImages = 0,
// get length of all images
numTotalImages = objects.filter(function (o){
numTotalImages = objects.filter(function (o) {
return o.type === 'image';
}).length;
var _this = this;
objects.forEach(function (o) {
objects.forEach(function (o, index) {
if (!o.type) {
return;
}
@ -1555,16 +1555,18 @@
case 'image':
case 'font':
fabric[capitalize(o.type)].fromObject(o, function (o) {
_this.add(o);
_this.insertAt(o, index);
if (++numLoadedImages === numTotalImages) {
if (callback) callback();
if (callback) {
callback();
}
}
});
break;
default:
var klass = fabric[camelize(capitalize(o.type))];
if (klass && klass.fromObject) {
_this.add(klass.fromObject(o));
_this.insertAt(klass.fromObject(o), index);
}
break;
}