Merge pull request #919 from Kienz/patch-1

Fix object selection with shift key - Closes issue #912
This commit is contained in:
Juriy Zaytsev 2013-10-22 11:44:53 -07:00
commit 22de867310
2 changed files with 5 additions and 2 deletions

View file

@ -479,6 +479,8 @@
if (activeGroup.size() === 1) {
// remove group alltogether if after removal it only contains 1 object
this.discardActiveGroup();
// activate last remaining object
this.setActiveObject(activeGroup.item(0));
}
}
else {

View file

@ -166,11 +166,12 @@
_shouldRender: function(target, pointer) {
var activeObject = this.getActiveGroup() || this.getActiveObject();
return (
return !!(
(target && (
target.isMoving ||
target !== activeObject)) ||
(!target && activeObject) ||
(!target && !!activeObject) ||
(!target && !activeObject && !this._groupSelector) ||
(pointer &&
this._previousPointer &&
this.selection && (