Interrupt drag events from other atoms when dragging and during reset…

… callbacks. #161

js/common/view/BAMScreenView.js

@@ -84,6 +84,7 @@ class BAMScreenView extends ScreenView {
 
     // Create a button to refill the kit
     const refillListener = () => {
+      this.interruptSubtreeInput();
       this.kitPlayAreaNode.resetPlayAreaKit();
       this.kitPlayAreaNode.currentKit.buckets.forEach( bucket => {
         bucket.setToFullState();
@@ -110,6 +111,7 @@ class BAMScreenView extends ScreenView {
     // Create a reset all button. Position altered on "Larger" Screen.
     this.resetAllButton = new ResetAllButton( {
       listener: () => {
+        this.interruptSubtreeInput();
 
         // When clicked, empty collection boxes
         kitCollectionList.currentCollectionProperty.value.collectionBoxes.forEach( box => {
@@ -342,6 +344,14 @@ class BAMScreenView extends ScreenView {
       dragBoundsProperty: new Property( this.atomDragBounds ),
       positionProperty: atom.positionProperty,
       start: () => {
+
+        // Interrupt drag events on other atom nodes
+        this.kitPlayAreaNode.atomLayer.children.forEach( otherAtomNode => {
+          if ( otherAtomNode && atomNode !== otherAtomNode ) {
+            otherAtomNode.interruptSubtreeInput();
+            otherAtomNode.atom.userControlledProperty.reset();
+          }
+        } );
         dragLength = 0;
         atom.destinationProperty.value = atom.positionProperty.value;
 
@@ -373,7 +383,7 @@ class BAMScreenView extends ScreenView {
         // Set the last position to the newly dragged position.
         lastPosition = atom.positionProperty.value;
 
-        // Handles atoms with multiple molecules
+        // Handles molecules with multiple atoms
         const molecule = currentKit.getMolecule( atom );
         if ( molecule ) {
           molecule.atoms.forEach( moleculeAtom => {
@@ -408,6 +418,7 @@ class BAMScreenView extends ScreenView {
         // We don't want to do this while the molecule is animating.
         currentKit.atomDropped( atom, droppedInKitArea );
 
+
         // Make sure to update the update button after moving atoms
         this.updateRefillButton();
       }

js/common/view/KitView.js

@@ -147,7 +147,7 @@ class KitView extends Node {
       const particleAddedListener = atom => {
 
         // AtomNode created based on atoms in bucket
-        const atomNode = new AtomNode( atom, {} );
+        const atomNode = new AtomNode( atom );
 
         // Keep track of the atomNode by mapping to its atom's ID then add to atom layer
         this.atomNodeMap[ atom.id ] = atomNode;