From 55af93d0a6d83a238ebff81ed19b304699ec05ec Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Thu, 21 Jun 2018 15:13:16 -0700
Subject: [PATCH] Fix issue deleting objects in sticky-zones
---
src/components/sticky-object.js | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/components/sticky-object.js b/src/components/sticky-object.js
index 933754ac6..6f5eca25e 100644
--- a/src/components/sticky-object.js
+++ b/src/components/sticky-object.js
@@ -64,6 +64,12 @@ AFRAME.registerComponent("sticky-object", {
_onGrab() {
this.setLocked(false);
+ },
+
+ remove() {
+ if (this.stuckTo) {
+ delete this.stuckTo.stuckObject;
+ }
}
});
@@ -90,12 +96,9 @@ AFRAME.registerComponent("sticky-object-zone", {
if (this.stuckObject) {
e.detail.clearedEls.forEach(el => {
if (this.stuckObject && this.stuckObject.el === el) {
- // this condition will be false when dragging an object directly from one sticky zone to another
- if (this.stuckObject.stuckTo === this) {
- this._unstickObject();
- }
- delete this.stuckObject;
+ this._unstickObject();
}
+ delete this.stuckObject;
});
}
});
@@ -117,8 +120,11 @@ AFRAME.registerComponent("sticky-object-zone", {
},
_unstickObject() {
- this.stuckObject.setLocked(false);
- this.stuckObject.el.body.collisionResponse = true;
- delete this.stuckObject.stuckTo;
+ // this condition will be false when dragging an object directly from one sticky zone to another
+ if (this.stuckObject.stuckTo === this) {
+ this.stuckObject.setLocked(false);
+ this.stuckObject.el.body.collisionResponse = true;
+ delete this.stuckObject.stuckTo;
+ }
}
});
--
GitLab