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

Merge pull request #895 from Kienz/patch-1

Browse source 
Invisible objects are no longer selectable with "selection-mode" (canvas.selection = true) - Closes issue #891
This commit is contained in:
Juriy Zaytsev 2013-10-10 03:12:47 -07:00
commit 79efcbf206
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/canvas.class.js
View file

@ -739,8 +739,11 @@
/**
* @private
* @param {Event} e mouse event
*/
_findSelectedObjects: function (e) {
if (!this.selection) return;
var group = [ ],
x1 = this._groupSelector.ex,
y1 = this._groupSelector.ey,
@ -754,20 +757,18 @@
for (var i = this._objects.length; i--; ) {
currentObject = this._objects[i];
if (!currentObject) continue;
if (!currentObject || !currentObject.selectable || !currentObject.visible) continue;
if (currentObject.intersectsWithRect(selectionX1Y1, selectionX2Y2) ||
currentObject.isContainedWithinRect(selectionX1Y1, selectionX2Y2) ||
currentObject.containsPoint(selectionX1Y1) ||
currentObject.containsPoint(selectionX2Y2)) {
currentObject.containsPoint(selectionX2Y2)
) {
currentObject.set('active', true);
group.push(currentObject);
if (this.selection && currentObject.selectable) {
currentObject.set('active', true);
group.push(currentObject);
// only add one object if it's a click
if (isClick) break;
}
// only add one object if it's a click
if (isClick) break;
}
}