Pman.Dialog.Image.bjs
[Pman.Core] / Pman.Dialog.Image.js
index 18ed2cc..deaf650 100644 (file)
@@ -78,6 +78,12 @@ Pman.Dialog.Image = {
                     method: 'GET',
                     success : function(data){
                         //console.log(data);
+                        
+                        if (dlg.haveProgress == 2) {
+                            // it's been closed elsewhere..
+                            return;
+                        }
+                        
                         if (dlg.uploadComplete) {
                             Roo.MessageBox.hide();
                             return;
@@ -111,6 +117,8 @@ Pman.Dialog.Image = {
                                 actioncomplete : function(_self,act)
                                 {
                                     _this.dialog.uploadComplete = true;
+                                    _this.dialog.haveProgress = 2; 
+                                    Roo.MessageBox.hide(); // force hiding
                                     _this.dialog.el.unmask();
                                      
                                     if (act.type == 'setdata') { 
@@ -248,7 +256,7 @@ Pman.Dialog.Image = {
                                     ts : Math.random()
                                 } 
                             });
-                            _this.dialog.haveProgress = 0,
+                            _this.dialog.haveProgress = 0; // set to show..
                             _this.dialog.uploadProgress.defer(1000, _this.dialog);
                         
                         }