DataObjects/Core_watch.php

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

diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index 7d153dc..80cb4c9 100644 (file)
--- a/Pman.Dialog.Image.js
+++ b/Pman.Dialog.Image.js
@@ -33,7 +33,28 @@ 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...
+                    
+                    
+                    
+                    
+                    var d = this;
+                    
+                    var pad =     d.el.getSize().height - (d.header.getSize().height +
+                        d.footer.getSize().height +        
+                        d.layout.getRegion('center').getPanel(0).el.getSize().height
+                        );
+                    
+                    var height = (
+                        pad + 
+                        d.header.getSize().height +
+                        d.footer.getSize().height +        
+                        d.layout.getRegion('center').getPanel(0).el.child('div').getSize().height
+                    );
+                    this.resizeTo(d.el.getSize().width, height);
+                    
                     if (this.keylistener) {
                         return;
                     }
@@ -93,6 +114,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 +150,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());
                                             
@@ -145,7 +175,7 @@ Pman.Dialog.Image = {
                                         Roo.log(act);
                                         //console.log(act);
                                         if (_this.callback) {
-                                            _this.callback.call(this, act.result.data);
+                                            _this.callback.call(this, act.result.data, act.result.extra);
                                         }
                                         return; 
                                     }
@@ -159,6 +189,8 @@ Pman.Dialog.Image = {
                                 },
                                 actionfailed : function (_self, act)
                                 {
+                                   
+                                   
                                     _this.dialog.uploadComplete = true;
                                    // _this.dialog.el.unmask();
                                     // error msg???
@@ -166,8 +198,9 @@ Pman.Dialog.Image = {
                                     if (act.type == 'submit') {
                                         Roo.log("Upload error");
                                         Roo.log(act);
+                                        
                                         try {
-                                            Roo.MessageBox.alert("Error", act.result.errorMsg);
+                                            Roo.MessageBox.alert("Error", act.result.errorMsg.split(/\n/).join('<BR/>'));
                                         } catch(e) {
                                           //  Roo.log(e);
                                             Roo.MessageBox.alert("Error", "Saving failed = fix errors and try again");