diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-08-18 23:08:32 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-08-18 23:08:32 -0600 |
| commit | 3b8323d5b4db4904aba9ea2f922140ab235dd681 (patch) | |
| tree | d61e7e2fef9d9aa58389b0cd6c83cb148e85644d /modules/server_add | |
| parent | bb6bf17076eff74ee490d17b510150d68f5faa54 (diff) | |
| parent | 67d770fb2a417359526923712899e8d799363bef (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add')
| -rw-r--r-- | modules/server_add/js/server_add.js | 2 | ||||
| -rw-r--r-- | modules/server_add/views/server_add_tree_dialog.html.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js index 3348de4b..fbd61dcc 100644 --- a/modules/server_add/js/server_add.js +++ b/modules/server_add/js/server_add.js @@ -52,7 +52,7 @@ function run_add(url) { $("#gStatus").html(data.status); $("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete); if (data.done) { - $("#gProgress").slideUp(); + $("#gServerAddProgress").slideUp(); } else { setTimeout(function() { run_add(url); }, 0); } diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php index 5c5dfd0f..431635f8 100644 --- a/modules/server_add/views/server_add_tree_dialog.html.php +++ b/modules/server_add/views/server_add_tree_dialog.html.php @@ -23,7 +23,7 @@ <?= $tree ?> </ul> - <div id="gProgress" style="display: none"> + <div id="gServerAddProgress" style="display: none"> <div class="gProgressBar"></div> <div id="gStatus"></div> </div> @@ -46,7 +46,7 @@ $("#gServerAdd .gProgressBar"). progressbar(). progressbar("value", 0); - $("#gProgress").slideDown("fast", function() { start_add() }); + $("#gServerAddProgress").slideDown("fast", function() { start_add() }); }); $("#gServerCloseButton").click(function(event) { $("#gDialog").dialog("close"); |