Moved required parameters to options, see #64

phetsims · Feb 14, 2018 · bd93616 · bd93616
1 parent e1d32d6
commit bd93616
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/js/friction/view/FrictionScreenView.js b/js/friction/view/FrictionScreenView.js
@@ -57,7 +57,9 @@ define( function( require ) {
     this.addChild( this.draggableBook );
 
     // add magnifier
-    this.magnifierNode = new MagnifierNode( model, 40, 25, 195, 425, chemistryString, {
+    this.magnifierNode = new MagnifierNode( model, 195, 425, chemistryString, {
+      x: 40,
+      y: 25,
       layerSplit: true,
       tandem: tandem.createTandem( 'magnifierNode' )
     } );

diff --git a/js/friction/view/magnifier/MagnifierNode.js b/js/friction/view/magnifier/MagnifierNode.js
@@ -53,22 +53,13 @@ define( function( require ) {
 
   /**
    * @param {FrictionModel} model
-   * @param {number} x
-   * @param {number} y
-   * @param {number} targetX // TODO: document this and below
-   * @param {number} targetY
-   * @param {string} title -  the title of the book that is draggable, used for a11y
+   * @param {number} targetX - x position of the MagnifierTargetNode rectangle
+   * @param {number} targetY - y position of the MagnifierTargetNode rectangle
+   * @param {string} title - the title of the book that is draggable, used for a11y
    * @param {Object} [options]
    * @constructor
    */
-  function MagnifierNode( model, x, y, targetX, targetY, title, options ) {
-
-    // TODO: move x,y into options
-    options = _.extend( {
-      x: x,
-      y: y
-    }, options );
-
+  function MagnifierNode( model, targetX, targetY, title, options ) {
     Node.call( this, options );
 
     // main params