DataObjects/Core_event_audit.php

[Pman.Core] / Pman.Dialog.Image.js

diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index 18ed2cc..b5f1708 100644 (file)
--- a/Pman.Dialog.Image.js
+++ b/Pman.Dialog.Image.js
@@ -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') { 
@@ -133,7 +141,8 @@ Pman.Dialog.Image = {
                                     
                                     if (act.type == 'submit') { // only submitted here if we are 
                                         _this.dialog.hide();
-                                        
+                                        Roo.log("Upload success");
+                                        Roo.log(act);
                                         //console.log(act);
                                         if (_this.callback) {
                                             _this.callback.call(this, act.result.data);
@@ -150,9 +159,10 @@ Pman.Dialog.Image = {
                                     _this.dialog.uploadComplete = true;
                                     _this.dialog.el.unmask();
                                     // error msg???
-                                    
+                                     _this.dialog.haveProgress = 2; 
                                     if (act.type == 'submit') {
-                                        //Roo.log(act);
+                                        Roo.log("Upload error");
+                                        Roo.log(act);
                                         try {
                                             Roo.MessageBox.alert("Error", act.result.errorMsg);
                                         } catch(e) {
@@ -248,7 +258,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);
                         
                         }