X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FAction.js;h=dd1a134a3f5f0434dca7898cd94f0e48cb0c49b5;hb=d59b277dae414c8ed4dbc3522847f5f1b495081a;hp=f9366db17656ccc7ef5c221c9c7cc7dbd80fad48;hpb=8ac7f193d58eac486cd349f622a0a6be16612172;p=roojs1

diff --git a/Roo/form/Action.js b/Roo/form/Action.js
index f9366db176..dd1a134a3f 100644
--- a/Roo/form/Action.js
+++ b/Roo/form/Action.js
@@ -8,7 +8,9 @@
  * Fork - LGPL
  * <script type="text/javascript">
  */
- 
+
+// as we use this in bootstrap.
+Roo.namespace('Roo.form');
  /**
  * @class Roo.form.Action
  * Internal Class used to handle form actions
@@ -16,6 +18,7 @@
  * @param {Roo.form.BasicForm} el The form element or its id
  * @param {Object} config Configuration options
  */
+
  
  
 // define the action interface
@@ -32,7 +35,7 @@ Roo.form.Action.CLIENT_INVALID = 'client';
  * Server Validation Failed
  * @const 
  */
- Roo.form.Action.SERVER_INVALID = 'server';
+Roo.form.Action.SERVER_INVALID = 'server';
  /**
  * Connect to Server Failed
  * @const 
@@ -67,6 +70,7 @@ Roo.form.Action.prototype = {
 
     // default connection failure
     failure : function(response){
+        
         this.response = response;
         this.failureType = Roo.form.Action.CONNECT_FAILURE;
         this.form.afterAction(this, false);
@@ -133,9 +137,12 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
     haveProgress : false,
     uploadComplete : false,
     
-    // uploadPrograss indicator.
+    // uploadProgress indicator.
     uploadProgress : function()
     {
+        if (!this.form.progressUrl) {
+            return;
+        }
         
         if (!this.haveProgress) {
             Roo.MessageBox.progress("Uploading", "Uploading");
@@ -156,8 +163,24 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
                 id : uid
             },
             method: 'GET',
-            success : function(data){
+            success : function(req){
                //console.log(data);
+                var rdata = false;
+                var edata;
+                try  {
+                   rdata = Roo.decode(req.responseText)
+                } catch (e) {
+                    Roo.log("Invalid data from server..");
+                    Roo.log(edata);
+                    return;
+                }
+                if (!rdata || !rdata.success) {
+                    Roo.log(rdata);
+                    Roo.MessageBox.alert(Roo.encode(rdata));
+                    return;
+                }
+                var data = rdata.data;
+                
                 if (this.uploadComplete) {
                    Roo.MessageBox.hide();
                    return;
@@ -170,11 +193,12 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
                 }
                 this.uploadProgress.defer(2000,this);
             },
-            scope : this,
-           failure: function(data) {
+       
+            failure: function(data) {
                 Roo.log('progress url failed ');
                 Roo.log(data);
-           }
+            },
+            scope : this
         });
            
     },
@@ -189,14 +213,12 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
         var method = this.getMethod();
         var isPost = method == 'POST';
         if(o.clientValidation === false || this.form.isValid()){
-            if (this.form.progressUrl && this.form.findField( 'UPLOAD_IDENTIFIER')) {
-                // use upload progress bar..
-                this.findField('UPLOAD_IDENTIFIER').setValue(
+            
+            if (this.form.progressUrl) {
+                this.form.findField('UPLOAD_IDENTIFIER').setValue(
                     (new Date() * 1) + '' + Math.random());
                     
-                    
-            }
-            
+            } 
             
             
             Roo.Ajax.request(Roo.apply(this.createCallback(), {
@@ -204,8 +226,11 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
                 url:this.getUrl(!isPost),
                 method: method,
                 params:isPost ? this.getParams() : null,
-                isUpload: this.form.fileUpload
+                isUpload: this.form.fileUpload,
+                formData : this.form.formData
             }));
+            
+            this.uploadProgress();
 
         }else if (o.clientValidation !== false){ // client validation failed
             this.failureType = Roo.form.Action.CLIENT_INVALID;
@@ -220,6 +245,7 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
             Roo.MessageBox.hide();
         }
         
+        
         var result = this.processResponse(response);
         if(result === true || result.success){
             this.form.afterAction(this, true);
@@ -231,12 +257,18 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
         }
         this.form.afterAction(this, false);
     },
-    failure : function(response){
+    failure : function(response)
+    {
         this.uploadComplete= true;
+        if (this.haveProgress) {
+            Roo.MessageBox.hide();
+        }
+        
         this.response = response;
         this.failureType = Roo.form.Action.CONNECT_FAILURE;
         this.form.afterAction(this, false);
     },
+    
     handleResponse : function(response){
         if(this.form.errorReader){
             var rs = this.form.errorReader.read(response);
@@ -280,6 +312,7 @@ Roo.extend(Roo.form.Action.Load, Roo.form.Action, {
     type : 'load',
 
     run : function(){
+        
         Roo.Ajax.request(Roo.apply(
                 this.createCallback(), {
                     method:this.getMethod(),
@@ -289,6 +322,7 @@ Roo.extend(Roo.form.Action.Load, Roo.form.Action, {
     },
 
     success : function(response){
+        
         var result = this.processResponse(response);
         if(result === true || !result.success || !result.data){
             this.failureType = Roo.form.Action.LOAD_FAILURE;