grunt update for a11y view robustness, phetsims/utterance-queue#1

phetsims · Nov 20, 2019 · f34d618 · f34d618
1 parent 1fb3fe9
commit f34d618
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/ohms-law_a11y_view.html b/ohms-law_a11y_view.html
@@ -262,17 +262,14 @@ <h3>PDOM & Descriptions for Ohm's Law</h3>
     if ( data.type === 'load' ) {
 
       var simFrame = document.getElementById( 'iframe' );
-      var innerDoc = simFrame.contentDocument || simFrame.contentWindow.document;
+      var innerWindow = simFrame.contentWindow;
 
       // copy of the parallel DOM
-      var PDOMRoot = simFrame.contentWindow.phet.joist.sim.display.accessibleDOMElement;
+      var PDOMRoot = innerWindow.phet.joist.sim.display.accessibleDOMElement;
       var PDOMCopy = PDOMRoot.cloneNode( true );
 
       // get the alert dom elements from the iframe's inner document
-      var politeElement1 = innerDoc.getElementById( 'elements-1-polite-1' );
-      var politeElement2 = innerDoc.getElementById( 'elements-1-polite-2' );
-      var politeElement3 = innerDoc.getElementById( 'elements-1-polite-3' );
-      var politeElement4 = innerDoc.getElementById( 'elements-1-polite-4' );
+      var ariaLiveElementsContainer = innerWindow.phet.joist.sim.display.utteranceQueue.getAriaLiveContainer();
 
       // get the alert dom elements from the PDOM copy
       var alertList = document.getElementById( 'alert-list' );
@@ -430,10 +427,9 @@ <h3>PDOM & Descriptions for Ohm's Law</h3>
       }
 
       // observe each of the live elements and add new text content to the list view
-      addLiveObserver( politeElement1, alertList );
-      addLiveObserver( politeElement2, alertList );
-      addLiveObserver( politeElement3, alertList );
-      addLiveObserver( politeElement4, alertList );
+      for ( let i = 0; i < ariaLiveElementsContainer.children.length; i++ ) {
+        addLiveObserver( ariaLiveElementsContainer.children[ i ], alertList );
+      }
 
       // set focus to the loaded iframe
       document.getElementById( 'iframe' ).focus();