Merge branch 'master' into wip_leon_T7456_New_Customer_Portal_100_Report

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 49b7888..97def3e 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -10050,8 +10050,6 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
         
                 var value = cm.config[i].summaryFooter;
 
-                Roo.log('value [' + i + '] : ' + value);
-
                 var td = {
                     tag: 'td',
                     cls : ' x-fcol-' + i,
@@ -10063,7 +10061,9 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                 
             }
             
-            tfoot.createChild(row);
+            tfoot.dom.innerHTML = '';
+
+            tfoot.createChild(tr);
         }
         
         Roo.each(this.el.select('tbody td', true).elements, function(e){
@@ -11312,7 +11312,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,