simplify focus listeners, #683

js/HomeScreenButton.js

@@ -186,6 +186,11 @@ class HomeScreenButton extends VBox {
     } );
     this.addInputListener( fireListener );
     this.addInputListener( { focus: event => { !isSelectedProperty.value && fireListener.fire( event ); } } );
+
+    // when a screen reader is in use, the button may be selected with the virtual cursor
+    // without focus landing on the button - toggle focus (and therefore size) in this case
+    this.addInputListener( { click: () => this.focus() } );
+
     this.addInputListener( {
       focus: () => isHighlightedProperty.set( true ),
       blur: () => isHighlightedProperty.set( false ),
@@ -202,16 +207,6 @@ class HomeScreenButton extends VBox {
       }
     } );
 
-    // pdom support for click listeners on the screen buttons
-    const toggleListener = () => {
-      this.focus();
-    };
-    this.addInputListener( { focus: toggleListener } );
-
-    // when a screen reader is in use, the button may be selected with the virtual cursor
-    // without focus landing on the button - toggle focus (and therefore size) in this case
-    this.addInputListener( { click: toggleListener } );
-
     // set the mouseArea and touchArea to be the whole local bounds of this node, because if it just relies on the
     // bounds of the icon and text, then there is a gap in between them. Since the button can change size, this
     // assignment needs to happen anytime the bounds change.