From 1a0002db0cda0a4f2183dc7dbfd7973391c27c63 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 13 Jun 2019 13:06:40 -0700
Subject: [PATCH] BUGZ-676: Remove references to interstitial from SUI version
of progress.js
---
scripts/simplifiedUI/system/progress.js | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/scripts/simplifiedUI/system/progress.js b/scripts/simplifiedUI/system/progress.js
index b373612790..a641dd4556 100644
--- a/scripts/simplifiedUI/system/progress.js
+++ b/scripts/simplifiedUI/system/progress.js
@@ -83,9 +83,7 @@
// The initial delay cooldown keeps us from tracking progress before the allotted time
// has passed.
INITIAL_DELAY_COOLDOWN_TIME = 1000,
- initialDelayCooldown = 0,
-
- isInInterstitialMode = false;
+ initialDelayCooldown = 0;
function fade() {
@@ -267,7 +265,7 @@
// Update state
if (!visible) { // Not visible because no recent downloads
- if ((displayProgress < 100 || gpuTextures > 0) && !isInInterstitialMode && !isInterstitialOverlaysVisible) { // Have started downloading so fade in
+ if (displayProgress < 100 || gpuTextures > 0) { // Have started downloading so fade in
visible = true;
alphaDelta = ALPHA_DELTA_IN;
fadeTimer = Script.setInterval(fade, FADE_INTERVAL);
@@ -307,9 +305,6 @@
} else {
x = x * BAR_HMD_REPEAT;
}
- if (isInInterstitialMode || isInterstitialOverlaysVisible) {
- visible = false;
- }
// Update progress bar
Overlays.editOverlay(barDesktop.overlay, {
@@ -349,10 +344,6 @@
}
}
- function interstitialModeChanged(inMode) {
- isInInterstitialMode = inMode;
- }
-
function setUp() {
var is4k = Window.innerWidth > 3000;
@@ -378,7 +369,6 @@
}
setUp();
- Window.interstitialModeChanged.connect(interstitialModeChanged);
GlobalServices.downloadInfoChanged.connect(onDownloadInfoChanged);
GlobalServices.updateDownloadInfo();
Script.setInterval(update, 1000 / 60);