Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item.

1 files changed, 9 insertions, 0 deletions

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 9bd02f9b..96cc0e26 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -21,12 +21,18 @@
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onClearQueue: function(event) {
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onComplete: function(event, queueID, fileObj, response, data) {
@@ -71,6 +77,9 @@
           $("#g-upload-cancel-all")
             .removeClass("ui-state-disabled")
             .attr("disabled", null);
+          $("#g-upload-done")
+            .addClass("ui-state-disabled")
+            .attr("disabled", "disabled");
         }
         return true;
       }