fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

Display upload progress more accurately, and don't hide the progress bar until server processing is complete

Browse source
This commit is contained in:
Kijin Sung 2016-12-17 23:06:59 +09:00
parent 9d7b731b4c
commit 73d4ea842f
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -123,6 +123,10 @@
} }
}, },
done: function(e, res) { done: function(e, res) {
data.settings.progressbarGraph.width('100%');
data.settings.progressPercent.text('100%');
data.settings.progressbar.delay(1000).slideUp();
data.settings.progressStatus.delay(1000).slideUp();
var result = res.response().result; var result = res.response().result;
var temp_code = ''; var temp_code = '';
if (!result) { if (!result) {
@ -153,6 +157,8 @@
} }
}, },
fail: function(e, data) { fail: function(e, data) {
data.settings.progressbar.delay(1000).slideUp();
data.settings.progressStatus.delay(1000).slideUp();
if (chunkStatus) { if (chunkStatus) {
alert(window.xe.msg_file_upload_error + " (Type 7)" + "<br>\n" + data.errorThrown + "<br>\n" + data.textStatus); alert(window.xe.msg_file_upload_error + " (Type 7)" + "<br>\n" + data.errorThrown + "<br>\n" + data.textStatus);
return false; return false;
@ -167,14 +173,9 @@
data.settings.progressbar.show(); data.settings.progressbar.show();
}, },
progressall: function (e, d) { progressall: function (e, d) {
var progress = parseInt(d.loaded / d.total * 100, 10); var progress = Math.round(d.loaded / d.total * 999) / 10;
data.settings.progressbarGraph.width(progress+'%'); data.settings.progressbarGraph.width(progress+'%');
data.settings.progressPercent.text(progress+'%'); data.settings.progressPercent.text(progress+'%');
if(progress >= 100) {
data.settings.progressbar.delay(3000).slideUp();
data.settings.progressStatus.delay(3000).slideUp();
}
} }
}; };
window.enforce_ssl = currentEnforce_ssl; window.enforce_ssl = currentEnforce_ssl;