support cdata wrappers on enclosed html return

[roojs1] / Roo / form / Action.js

diff --git a/Roo/form/Action.js b/Roo/form/Action.js
index 4b571ae..febdb1d 100644 (file)
--- a/Roo/form/Action.js
+++ b/Roo/form/Action.js
@@ -212,7 +212,6 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
         var o = this.options;
         var method = this.getMethod();
         var isPost = method == 'POST';
-        Roo.log(o);
         if(o.clientValidation === false || this.form.isValid()){
             
             if (this.form.progressUrl) {
@@ -227,7 +226,8 @@ 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();
@@ -289,7 +289,13 @@ Roo.extend(Roo.form.Action.Submit, Roo.form.Action, {
         }
         var ret = false;
         try {
-            ret = Roo.decode(response.responseText);
+            var rt = response.responseText;
+            if (rt.match(/^\<!--\[CDATA\[/)) {
+                rt = rt.replace(/^\<!--\[CDATA\[/,'');
+                rt = rt.replace(/\]\]--\>$/,'');
+            }
+            
+            ret = Roo.decode(rt);
         } catch (e) {
             ret = {
                 success: false,