Changeset 4512

Timestamp:

01/25/12 13:09:35 (4 months ago)

Author:

tboutell

Message:

#698 only one upgrade button:

* If an error returned by the server has stopQueue => true, stop all remaining uploads

* Return stopQueue => true on a disk quota full error

* Tolerate a negative number of files in progress, don't show a don't leave the page dialog (we'd like to thoroughly debug how this happens)

* Hide all spinners when we stop the music

Files:

• plugins/apostropheHTML5Plugin/trunk/web/fileuploader/fileuploader.js (modified) (3 diffs)

plugins/apostropheHTML5Plugin/trunk/web/fileuploader/fileuploader.js

@@ -350 +350 @@
         
         qq.attach(window, 'beforeunload', function(e){
-            if (!self._filesInProgress){return;}
+            // Should never be <0 but I see it happening. tom@punkave.com
+            if (self._filesInProgress <= 0){return;}
             
             var e = e || window.event;
@@ -366 +367 @@
     _onComplete: function(id, fileName, result){
         this._filesInProgress--;                 
-        if (result.error){
+        if (result.error) {
+            if (result.stopQueue){
+              this._handler.cancelAll();
+            }
             this._options.showMessage(result.error);
         }             
@@ -922 +926 @@
             this._cancel(this._queue[i]);
         }
+        // This shouldn't be necessary but we've seen
+        // the "uploads still in progress" warning
+        // even after cancelAll. tom@punkave.com
+        this._filesInProgress = 0;
+        
         this._queue = [];
     },