Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Denz1994 committed May 6, 2020
2 parents a3526dc + 6e814b2 commit f2ef8d4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions js/common/model/Molecule.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import MoleculeStructure from './MoleculeStructure.js';

class Molecule extends MoleculeStructure {
/**
* REVIEW: Many call sites that don't specify these documented-required options. See MoleculeStrucutre, and mark as optional?
* @param {number} numAtoms
* @param {number} numBonds
*/
Expand Down
1 change: 1 addition & 0 deletions js/common/model/MoleculeList.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ class MoleculeList {
}

// statics
//REVIEW: visibility/type info on these?
MoleculeList.masterInstance = null;
MoleculeList.initialized = false;
MoleculeList.initialList = new MoleculeList();
Expand Down
1 change: 1 addition & 0 deletions js/common/view/KitNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class KitNode extends Node {
// different layout.
kit.buckets.forEach( bucket => {
const bucketFront = new BucketFront( bucket, BAMConstants.MODEL_VIEW_TRANSFORM, {
//REVIEW: I can't see where this labelFont option is used? Can you find the API point?
labelFont: new PhetFont( {
weight: 'bold',
size: 18
Expand Down
1 change: 1 addition & 0 deletions js/common/view/KitPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class KitPanel extends Node {
this.kitCarousel = new Carousel( kitNodes, {
fill: BAMConstants.KIT_BACKGROUND,
stroke: BAMConstants.KIT_BORDER,
//REVIEW: I don't see xMargin in any doc for Carousel, what is the option doing here?
xMargin: 10,
itemsPerPage: 1,
animationEnabled: false,
Expand Down
1 change: 1 addition & 0 deletions js/common/view/MoleculeBondNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class MoleculeBondNode extends Node {
visible: true
} ) );

//REVIEW: ButtonListener is deprecated, can we use FireListener?
cutTargetNode.addInputListener( new ButtonListener( {
down() {
cutTargetNode.cursor = closedCursor;
Expand Down
2 changes: 2 additions & 0 deletions js/common/view/WarningDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class WarningDialog extends Dialog {
],
spacing: 15,
align: 'center',

//REVIEW: What is this xMargin option for?
xMargin: 15,
cursor: 'pointer'
} );
Expand Down
1 change: 1 addition & 0 deletions js/common/view/view3d/ShowMolecule3DButtonNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class ShowMolecule3DButtonNode extends RectangularPushButton {
soundPlayer: Playable.NO_SOUND
}, options ) );

//REVIEW: ButtonListener is deprecated, can we use FireListener instead?
this.addInputListener( new ButtonListener( {
fire() {
showDialogCallback( completeMolecule );
Expand Down

0 comments on commit f2ef8d4

Please sign in to comment.