Merge pull request #2503 from asturur/obj.selectab

Fix object selectable with shift click and itext mouse cursor click.
fabricjs · Sep 29, 2015 · 9549631 · 9549631
2 parents 33cdaa1 + 6426a02
commit 9549631
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/canvas.class.js b/src/canvas.class.js
@@ -923,7 +923,6 @@
       if (obj &&
           obj.visible &&
           obj.evented &&
-          obj.selectable &&
           this.containsPoint(e, obj)){
         if ((this.perPixelTargetFind || obj.perPixelTargetFind) && !obj.isEditing) {
           var isTransparent = this.isTargetTransparent(obj, pointer.x, pointer.y);

diff --git a/src/mixins/canvas_grouping.mixin.js b/src/mixins/canvas_grouping.mixin.js
@@ -13,7 +13,7 @@
      */
     _shouldGroup: function(e, target) {
       var activeObject = this.getActiveObject();
-      return e.shiftKey &&
+      return e.shiftKey && target && target.selectable &&
             (this.getActiveGroup() || (activeObject && activeObject !== target))
             && this.selection;
     },