This commit is contained in:
Rick Falkvinge
2018-02-11 22:49:52 +01:00
parent 8ff41e0118
commit 95e1fa9b26
2 changed files with 4 additions and 17 deletions
+4 -15
View File
@@ -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)) { %>
-2
View File
@@ -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);
}
}