Using let/const in aqua, see phetsims/tasks#1037

phetsims · Jan 5, 2021 · 256a868 · 256a868
1 parent 31ffe63
commit 256a868
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 45 deletions.
diff --git a/js/client/client.js b/js/client/client.js
@@ -8,10 +8,7 @@
 
 'use strict';
 
-// Because ES5 for IE11 compatibility
-/* eslint-disable no-var */
-
-var aquaOptions = QueryStringMachine.getAll( {
+const aquaOptions = QueryStringMachine.getAll( {
   testInfo: {
     type: 'string',
     defaultValue: '{}'
@@ -26,8 +23,8 @@ var aquaOptions = QueryStringMachine.getAll( {
   }
 } );
 
-var sentMessage = false;
-var iframe = null;
+let sentMessage = false;
+let iframe = null;
 
 window.aqua = {
   // @public {Object}

diff --git a/js/client/no-test.js b/js/client/no-test.js
@@ -8,10 +8,7 @@
 
 'use strict';
 
-// Because ES5 for IE11 compatibility
-/* eslint-disable no-var */
-
-var options = QueryStringMachine.getAll( {
+const options = QueryStringMachine.getAll( {
   duration: {
     type: 'number',
     defaultValue: 10000

diff --git a/js/client/pageload-test.js b/js/client/pageload-test.js
@@ -9,10 +9,7 @@
 
 'use strict';
 
-// Because ES5 for IE11 compatibility
-/* eslint-disable no-var */
-
-var options = QueryStringMachine.getAll( {
+const options = QueryStringMachine.getAll( {
   url: {
     type: 'string',
     defaultValue: ''
@@ -24,7 +21,7 @@ var options = QueryStringMachine.getAll( {
   }
 } );
 
-var iframe = aqua.createFrame();
+const iframe = aqua.createFrame();
 iframe.src = options.url;
 
 setTimeout( function() {
@@ -37,7 +34,7 @@ window.addEventListener( 'message', function( evt ) {
     return;
   }
 
-  var data = JSON.parse( evt.data );
+  const data = JSON.parse( evt.data );
 
   // Sent by Joist due to the postMessage* query parameters
   if ( data.type === 'pageload-load' ) {

diff --git a/js/client/qunit-test.js b/js/client/qunit-test.js
@@ -8,10 +8,7 @@
 
 'use strict';
 
-// Because ES5 for IE11 compatibility
-/* eslint-disable no-var */
-
-var options = QueryStringMachine.getAll( {
+const options = QueryStringMachine.getAll( {
   url: {
     type: 'string',
     defaultValue: ''
@@ -22,16 +19,16 @@ var options = QueryStringMachine.getAll( {
   }
 } );
 
-var iframe = aqua.createFrame();
+const iframe = aqua.createFrame();
 iframe.src = options.url;
 
 // Since QUnit doesn't give us an accurate "done" message, we just tally pass/fail counts
-var passed = 0;
-var failed = 0;
-var receivedDone = false;
-var message = '';
+let passed = 0;
+let failed = 0;
+let receivedDone = false;
+let message = '';
 
-var done = function() {
+const done = function() {
   if ( id !== null ) {
     message = iframe.src + '\n' + passed + ' out of ' + ( passed + failed ) + ' tests passed. ' + failed + ' failed.\n' + message;
     if ( !receivedDone ) {
@@ -50,14 +47,14 @@ var done = function() {
 };
 
 // Supports old tests (which do not know when they are done)
-var id = setTimeout( done, options.duration );
+let id = setTimeout( done, options.duration );
 
 window.addEventListener( 'message', function( evt ) {
   if ( typeof evt.data !== 'string' ) {
     return;
   }
 
-  var data = JSON.parse( evt.data );
+  const data = JSON.parse( evt.data );
 
   // Sent from all of our QUnit wrappers
   if ( data.type === 'qunit-test' ) {

diff --git a/js/client/sim-test.js b/js/client/sim-test.js
@@ -8,10 +8,7 @@
 
 'use strict';
 
-// Because ES5 for IE11 compatibility
-/* eslint-disable no-var */
-
-var options = QueryStringMachine.getAll( {
+const options = QueryStringMachine.getAll( {
   url: {
     type: 'string',
     defaultValue: ''
@@ -33,15 +30,15 @@ var options = QueryStringMachine.getAll( {
 } );
 
 // Add those two to our query parameters, so we get load/error messages
-var iframe = aqua.createFrame();
+const iframe = aqua.createFrame();
 iframe.src = QueryStringMachine.appendQueryStringArray( options.url, [
   '?continuousTest=' + encodeURIComponent( aqua.options.testInfo ),
   options.simQueryParameters
 ] );
 
-var failPrefix = ( options.simQueryParameters ? ( 'Query: ' + options.simQueryParameters + '\n' ) : '' );
+const failPrefix = ( options.simQueryParameters ? ( 'Query: ' + options.simQueryParameters + '\n' ) : '' );
 
-var hasLoaded = false;
+let hasLoaded = false;
 
 setTimeout( function() {
   if ( hasLoaded ) {
@@ -57,14 +54,14 @@ setTimeout( function() {
   }
 }, options.duration );
 
-var testInfo = JSON.parse( aqua.options.testInfo );
+const testInfo = JSON.parse( aqua.options.testInfo );
 
 // handling messages from sims
 window.addEventListener( 'message', function( evt ) {
   if ( typeof evt.data !== 'string' ) {
     return;
   }
-  var data = JSON.parse( evt.data );
+  const data = JSON.parse( evt.data );
 
   // Filter out any message that isn't directly from this test
   if ( data.continuousTest && _.isEqual( testInfo, data.continuousTest ) ) {

diff --git a/js/client/wrapper-test.js b/js/client/wrapper-test.js
@@ -8,10 +8,7 @@
 
 'use strict';
 
-// Because ES5 for IE11 compatibility
-/* eslint-disable no-var */
-
-var options = QueryStringMachine.getAll( {
+const options = QueryStringMachine.getAll( {
   url: {
     type: 'string',
     defaultValue: ''
@@ -28,12 +25,12 @@ var options = QueryStringMachine.getAll( {
 } );
 
 // Add those two to our query parameters, so we get load/error messages
-var iframe = aqua.createFrame();
+const iframe = aqua.createFrame();
 iframe.src = QueryStringMachine.appendQueryStringArray( options.url, [
   '?wrapperContinuousTest=' + encodeURIComponent( aqua.options.testInfo )
 ] );
 
-var hasLoaded = false;
+let hasLoaded = false;
 
 setTimeout( function() {
   if ( hasLoaded ) {
@@ -49,14 +46,14 @@ setTimeout( function() {
   }
 }, options.duration );
 
-var testInfo = JSON.parse( aqua.options.testInfo );
+const testInfo = JSON.parse( aqua.options.testInfo );
 
 // handling messages from sims
 window.addEventListener( 'message', function( evt ) {
   if ( typeof evt.data !== 'string' ) {
     return;
   }
-  var data = JSON.parse( evt.data );
+  const data = JSON.parse( evt.data );
 
   // Filter out any message that isn't directly from this test
   if ( data.continuousTest && _.isEqual( testInfo, data.continuousTest ) ) {