summaryrefslogtreecommitdiff
path: root/modules/server_add/js/server_add.js
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-07-10 10:07:33 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-07-10 10:07:33 -0700
commitacf920fc7ed1a9d1d69bd12bdfa136d4bb5af0d3 (patch)
tree5a945fceb217f3c583f7573fea86cce36c1b4d67 /modules/server_add/js/server_add.js
parent4f24a5f5930472fa23265228e5d7a6605b74ade2 (diff)
parent7c993387dadeb721f4c74185fc5ee0e376c4300b (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add/js/server_add.js')
-rw-r--r--modules/server_add/js/server_add.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index cba8c9ce..1a78d733 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -66,6 +66,7 @@ function start_add() {
data: { "paths[]": paths },
dataType: "json",
success: function(data, textStatus) {
+ $("#gStatus").html(data.status);
$("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete);
setTimeout(function() { run_add(data.url); }, 0);
}
@@ -79,9 +80,10 @@ function run_add(url) {
async: false,
dataType: "json",
success: function(data, textStatus) {
+ $("#gStatus").html(data.status);
$("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete);
if (data.done) {
- $("#gServerAdd .gProgressBar").slideUp();
+ $("#gProgress").slideUp();
} else {
setTimeout(function() { run_add(url); }, 0);
}