Skip to content

Commit

Permalink
add UTTERANCE_QUEUE to configs, move tests over to utterance-queue re…
Browse files Browse the repository at this point in the history
…po, convert usages to use the library, not the scenery-phet ones, delete those, phetsims/utterance-queue#2
  • Loading branch information
zepumph committed Oct 22, 2019
1 parent c503e9e commit 319dee3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions js/tappi-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ require.config( {
SUN: '../../sun/js',
TAMBO: '../../tambo/js',
TANDEM: '../../tandem/js',
TAPPI: '.'
TAPPI: '.',
UTTERANCE_QUEUE: '../../utterance-queue/js'
},

// optional cache bust to make browser refresh load all included scripts, can be enabled with ?cacheBust
// Cache busting is applied by default, but can be disabled via ?cacheBust=false, see initialize-globals.js
urlArgs: phet.chipper.getCacheBustArgs()
} );
6 changes: 3 additions & 3 deletions tappi_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
const brandMatch = location.search.match( /brand=([^&]+)/ );
const brand = brandMatch ? decodeURIComponent( brandMatch[ 1 ] ) : 'adapted-from-phet';

// matches "cacheBust" at the start of the string, as well as directly after "?" or "&"
const cacheBust = /(^|\?|&)cacheBust/.test( location.search );
const queryAppend = cacheBust ? `?bust=${Date.now()}` : '';
// Cache busting is applied by default, but can be disabled via ?cacheBust=false, see initialize-globals.js
const isCacheBustDisabled = /(^|\?|&)cacheBust=false/.test( location.search );
const queryAppend = isCacheBustDisabled ? '' : `?bust=${Date.now()}`;

// Preloads, with more included for phet-io brand
let preloads = [
Expand Down

0 comments on commit 319dee3

Please sign in to comment.