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

Remove setCoords in fabric.Group#render. Build distribution. Version 1.3.11. Closes #979

Browse source
This commit is contained in:
kangax 2013-11-14 18:47:10 +01:00
parent 9cf0ac8877
commit 26bdd0de69
8 changed files with 25 additions and 16 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.10" };
var fabric = fabric || { version: "1.3.11" };
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.10",
"version": "1.3.11",
"keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"],
"dependencies": {},
"development": {},

11
dist/all.js vendored
View file

@ -1,7 +1,7 @@
/* build: `node build.js modules=ALL exclude=gestures minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2013, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "1.3.10" };
var fabric = fabric || { version: "1.3.11" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@ -9167,7 +9167,8 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
* @param {fabric.Object} target
*/
_shouldClearSelection: function (e, target) {
var activeGroup = this.getActiveGroup();
var activeGroup = this.getActiveGroup(),
activeObject = this.getActiveObject();
return (
!target
@ -9179,6 +9180,11 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
!e.shiftKey)
||
(target && !target.evented)
||
(target &&
!target.selectable &&
activeObject &&
activeObject !== target)
);
},
@ -16757,7 +16763,6 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
this.drawControls(ctx);
}
ctx.restore();
this.setCoords();
},
/**

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.

11
dist/all.require.js vendored
View file

@ -1,7 +1,7 @@
/* build: `node build.js modules=ALL exclude=gestures minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2013, Printio (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "1.3.10" };
var fabric = fabric || { version: "1.3.11" };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@ -9167,7 +9167,8 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
* @param {fabric.Object} target
*/
_shouldClearSelection: function (e, target) {
var activeGroup = this.getActiveGroup();
var activeGroup = this.getActiveGroup(),
activeObject = this.getActiveObject();
return (
!target
@ -9179,6 +9180,11 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
!e.shiftKey)
||
(target && !target.evented)
||
(target &&
!target.selectable &&
activeObject &&
activeObject !== target)
);
},
@ -16757,7 +16763,6 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
this.drawControls(ctx);
}
ctx.restore();
this.setCoords();
},
/**

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

1
src/shapes/group.class.js
View file

@ -236,7 +236,6 @@
this.drawControls(ctx);
}
ctx.restore();
this.setCoords();
},
/**