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

Fix objects enlivening with sparse arrays. Version 1.3.3

Browse source
This commit is contained in:
kangax 2013-09-24 15:58:52 +02:00
parent 5dc3bcff6d
commit 15a6a3c3df
8 changed files with 24 additions and 24 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-2013, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "1.3.2" };
var fabric = fabric || { version: "1.3.3" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}

2
component.json
View file

@ -2,7 +2,7 @@
"name": "fabric.js",
"repo": "kangax/fabric.js",
"description": "Object model for HTML5 canvas, and SVG-to-canvas parser. Backed by jsdom and node-canvas.",
"version": "1.3.2",
"version": "1.3.3",
"keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"],
"dependencies": {},
"development": {},

13
dist/all.js vendored
View file

@ -1,7 +1,7 @@
/* build: `node build.js modules=ALL exclude=gestures` */
/*! Fabric.js Copyright 2008-2013, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "1.3.2" };
var fabric = fabric || { version: "1.3.3" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@ -2206,7 +2206,9 @@ fabric.Collection = {
numTotalObjects = objects.length;
objects.forEach(function (o, index) {
if (!o.type) {
// if sparse array
if (!o || !o.type) {
numLoadedObjects++;
return;
}
var klass = fabric.util.getKlass(o.type, namespace);
@ -17243,12 +17245,9 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
iLen = data.length, i,
tintR, tintG, tintB,
r, g, b, alpha1,
color, source;
source;
color = this.color instanceof fabric.Color
? this.color
: new fabric.Color(this.color);
source = color.getSource();
source = new fabric.Color(this.color).getSource();
tintR = source[0] * this.opacity;
tintG = source[1] * this.opacity;

12
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.

13
dist/all.require.js vendored
View file

@ -1,7 +1,7 @@
/* build: `node build.js modules=ALL exclude=gestures` */
/*! Fabric.js Copyright 2008-2013, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "1.3.2" };
var fabric = fabric || { version: "1.3.3" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@ -2206,7 +2206,9 @@ fabric.Collection = {
numTotalObjects = objects.length;
objects.forEach(function (o, index) {
if (!o.type) {
// if sparse array
if (!o || !o.type) {
numLoadedObjects++;
return;
}
var klass = fabric.util.getKlass(o.type, namespace);
@ -17243,12 +17245,9 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
iLen = data.length, i,
tintR, tintG, tintB,
r, g, b, alpha1,
color, source;
source;
color = this.color instanceof fabric.Color
? this.color
: new fabric.Color(this.color);
source = color.getSource();
source = new fabric.Color(this.color).getSource();
tintR = source[0] * this.opacity;
tintG = source[1] * this.opacity;

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

4
src/util/misc.js
View file

@ -182,7 +182,9 @@
numTotalObjects = objects.length;
objects.forEach(function (o, index) {
if (!o.type) {
// if sparse array
if (!o || !o.type) {
numLoadedObjects++;
return;
}
var klass = fabric.util.getKlass(o.type, namespace);