Reset the kits of the previous collection before it is swapped. Updat…

…e doc regarding currentCollectionProperty links. #141
phetsims · Feb 10, 2020 · fcf880d · fcf880d
1 parent 2166beb
commit fcf880d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/js/common/view/BAMScreenView.js b/js/common/view/BAMScreenView.js
@@ -200,6 +200,9 @@ define( require => {
         if ( previousCollection ) {
           previousCollection.kits.forEach( kit => {
 
+            // Reset the kit before managing its listeners
+            kit.reset();
+
             // Removed previous listeners related to metadataLayer create and deletion.
             kit.addedMoleculeEmitter.removeListener( this.addedEmitterListeners[ kit.id ] );
             kit.removedMoleculeEmitter.removeListener( this.removedEmitterListeners[ kit.id ] );

diff --git a/js/common/view/CollectionPanel.js b/js/common/view/CollectionPanel.js
@@ -69,6 +69,8 @@ define( require => {
         } ),
         maxWidth: BAMConstants.TEXT_MAX_WIDTH
       } );
+
+      // Manages changing the label of the current collection
       kitCollectionList.currentCollectionProperty.link( () => {
         currentCollectionText.text = StringUtils.fillIn( collectionPatternString, {
           number: kitCollectionList.currentIndex + BuildAMoleculeQueryParameters.skipLevels
@@ -93,6 +95,7 @@ define( require => {
         }
       } );
 
+      // Update the arrows that indicate the next/previous collection
       const updateSwitcher = () => {
         collectionSwitcher.hasNextProperty.value = kitCollectionList.hasNextCollection();
         collectionSwitcher.hasPreviousProperty.value = kitCollectionList.hasPreviousCollection();
@@ -127,6 +130,7 @@ define( require => {
       // use the current collection
       this.useCollection( kitCollectionList.currentCollectionProperty.value );
 
+      // As the current collection changes, use that new collection
       kitCollectionList.currentCollectionProperty.link( newCollection => {
         this.useCollection( newCollection );
       } );