From 95e1fa9b266b446b724081144202dae9dadfe1ca Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 11 Feb 2018 22:49:52 +0100 Subject: [PATCH] Simplify --- Site/Controls/v5/Base/ProgressBar.ascx | 19 ++++--------------- Site/Scripts/Swarmops-v5.js | 2 -- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Site/Controls/v5/Base/ProgressBar.ascx b/Site/Controls/v5/Base/ProgressBar.ascx index 0fcbcff9..ad2db4c4 100644 --- a/Site/Controls/v5/Base/ProgressBar.ascx +++ b/Site/Controls/v5/Base/ProgressBar.ascx @@ -36,14 +36,10 @@ if (newProgress > <%=this.ClientID%>_lastProgress) { - if (newProgress < 100) { - // The 100% complete case is dealt with later - - $("#Div_<%=this.ClientID %>_ProgressBar .progressbar-value").animate( - { - width: newProgress + "%" - }, { queue: false }); - } + $("#Div_<%=this.ClientID %>_ProgressBar .progressbar-value").animate( + { + width: newProgress + "%" + }, { queue: false }); if (<%=this.ClientID%>_lastProgress < 50 && newProgress >= 50) { // check for halfway callback @@ -57,13 +53,6 @@ if (<%=this.ClientID%>_lastProgress < 100 && newProgress >= 100) { - alertify.log("100% width"); - - $("#Div_<%=this.ClientID %>_ProgressBar .progressbar-value").animate( - { - width: "100%" - }, { queue: false }); - // check for completion callback <% if (!String.IsNullOrEmpty(this.OnClientProgressCompleteCallback)) { %> diff --git a/Site/Scripts/Swarmops-v5.js b/Site/Scripts/Swarmops-v5.js index 6ecf311e..e098f04b 100644 --- a/Site/Scripts/Swarmops-v5.js +++ b/Site/Scripts/Swarmops-v5.js @@ -126,11 +126,9 @@ function _masterInitializeSocket(authenticationTicket) { } } else if (message.MessageType == "ProgressUpdate") { - alertify.log("Received ProgressUpdate: " + message.Progress); var updateFunction = window["progressUpdateCallback_" + message.Guid]; if (updateFunction != undefined) { - alertify.log("Calling ProgressUpdate: " + message.Progress); updateFunction(message.Progress); } }