Pman.Dialog.Image.bjs

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

diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index 202afe9..d003d93 100644 (file)
--- a/Pman.Dialog.Image.js
+++ b/Pman.Dialog.Image.js
@@ -33,7 +33,11 @@ Pman.Dialog.Image = {
             listeners : {
                 show : function (_self)
                 {
+                
                     // this does not really work - escape on the borders works..
+                    // resize to fit.. if we have styled stuff...
+                    
+                    
                     if (this.keylistener) {
                         return;
                     }
@@ -93,6 +97,11 @@ Pman.Dialog.Image = {
                             Roo.MessageBox.updateProgress(data.bytes_uploaded/data.bytes_total,
                                 Math.floor((data.bytes_total - data.bytes_uploaded)/1000) + 'k remaining'
                             );
+                        } else {
+                            Roo.MessageBox.updateProgress(1,
+                                "Upload Complete - processing"
+                            );
+                            return;
                         }
                         dlg.uploadProgress.defer(2000,dlg);
                     },
@@ -124,6 +133,10 @@ Pman.Dialog.Image = {
                                     if (act.type == 'setdata') { 
                                         this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php';
                                         this.el.dom.action = this.url;
+                                        if (typeof(_this.data.timeout) != 'undefined') {
+                                            this.timeout = _this.data.timeout;
+                                        }
+                                        
                                         this.findField('UPLOAD_IDENTIFIER').setValue(
                                             (new Date() * 1) + '' + Math.random());