buildSDK/dependancy_bootstrap.txt

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 19ec848..770cb96 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2486,6 +2486,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
         
         var tbody = this.el.select('tbody', true).first();
         
+        var renders = [];
+        
         if(this.store.getCount() > 0){
             this.store.data.each(function(d){
                 var row = {
@@ -2496,22 +2498,25 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                 for(var i = 0, len = cm.getColumnCount(); i < len; i++){
                     var renderer = cm.getRenderer(i);
                     var value = '';
+                    var id = Roo.id();
                     
                     if(typeof(renderer) !== 'undefined'){
                         value = renderer(d.data[cm.getDataIndex(i)], false, d);
                     }
                     
                     if(typeof(value) === 'object'){
-                        row.cn.push({
-                            tag: 'td',
-                            cn: value
-                        })
-                    }else{
-                        row.cn.push({
-                            tag: 'td',
-                            html: value
+                        renders.push({
+                            id : id,
+                            cfg : value 
                         })
                     }
+                    
+                    row.cn.push({
+                        tag: 'td',
+                        id: id,
+                        html: (typeof(value) === 'object') ? '' : value
+                    })
+                   
                 }
                 
                 tbody.createChild(row);
@@ -2519,6 +2524,11 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
             });
         }
         
+        if(renders.length){
+            Roo.each(renders, function(r){
+                r.cfg.render(Roo.get(r.id));
+            })
+        }
 //        
 //        if(this.loadMask){
 //            this.maskEl.hide();
@@ -7361,6 +7371,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             this.pageTb = new Roo.Toolbar(this.footer);
            
         }
+        */
         if(this.pageSize){
             this.footer = this.list.createChild({cls:cls+'-ft'});
             this.pageTb = new Roo.PagingToolbar(this.footer, this.store,
@@ -7384,7 +7395,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         if (this.footer) {
             this.assetHeight += this.footer.getHeight();
         }
-        */
+        
             
         if(!this.tpl){
             this.tpl = '<li><a href="#">{' + this.displayField + '}</a></li>';
@@ -9104,7 +9115,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         
         this.on('monthchange', this.onMonthChange, this);
         
-        this.update(new Date().clearTime());
+//        this.update(new Date().clearTime());
     },
     
     resize : function() {