Properly dispose Drag and HoverColor behaviors

AltspaceVR · Nov 15, 2016 · 2863233 · 2863233
1 parent 4bd7ffa
commit 2863233
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/utilities/behaviors/Drag.js b/src/utilities/behaviors/Drag.js
@@ -185,5 +185,9 @@ altspace.utilities.behaviors.Drag = function (config) {
 		object3d.addEventListener('cursordown', startDrag);
 	}
 
-	return { awake: awake, start: start, type: 'Drag' };
+	function dispose() {
+		object3d.removeEventListener('cursordown', startDrag);
+	}
+
+	return { awake: awake, start: start, dispose: dispose, type: 'Drag' };
 };
diff --git a/src/utilities/behaviors/HoverColor.js b/src/utilities/behaviors/HoverColor.js
@@ -102,9 +102,17 @@ altspace.utilities.behaviors.HoverColor = function(config){
 		}
 	}
 
+	function dispose() {
+		object3d.removeEventListener('cursordown', cursordown);
+		scene.removeEventListener('cursorup', cursorupScene);
+		object3d.removeEventListener('cursorenter', cursorenter);
+		object3d.removeEventListener('cursorleave', cursorleave);
+	}
+
 	return {
 		//no update method, event-driven
 		awake: awake,
+		dispose: dispose,
 		type: 'HoverColor'
 	};