From e5938d41b1e83bf06dc3a9f666d9b6ec1c4aac39 Mon Sep 17 00:00:00 2001 From: samreid Date: Fri, 4 Oct 2019 08:04:53 -0600 Subject: [PATCH] grunt update, see https://github.com/phetsims/chipper/issues/541 --- area-model-multiplication_en.html | 6 +++--- js/area-model-multiplication-config.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/area-model-multiplication_en.html b/area-model-multiplication_en.html index 1e5e709..749dcdb 100644 --- a/area-model-multiplication_en.html +++ b/area-model-multiplication_en.html @@ -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 = [ diff --git a/js/area-model-multiplication-config.js b/js/area-model-multiplication-config.js index 83da002..a757056 100644 --- a/js/area-model-multiplication-config.js +++ b/js/area-model-multiplication-config.js @@ -46,6 +46,6 @@ require.config( { VEGAS: '../../vegas/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() } );