From 1e8352f7dfeec4db5cf21630bfc344875bca5626 Mon Sep 17 00:00:00 2001 From: john Date: Fri, 12 Oct 2018 11:37:47 +0800 Subject: [PATCH] Roo/bootstrap/Table.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Table.js | 4 ++-- roojs-bootstrap-debug.js | 4 ++-- roojs-bootstrap.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Roo/bootstrap/Table.js b/Roo/bootstrap/Table.js index 54adb4b64e..8b7a28da46 100644 --- a/Roo/bootstrap/Table.js +++ b/Roo/bootstrap/Table.js @@ -1203,8 +1203,6 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { for(var j = 0; j < w.length; j++) { - Roo.log('spliting;;;'); - var size_cls = w[j].split("-"); if(!Number.isInteger(size_cls[1] * 1)) { @@ -1215,6 +1213,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { continue; } + Roo.log('returning..'); + if(!rows[i].classList.contains("col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]])) { continue; } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 0227c36ce8..3e0ecd15cf 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -7147,8 +7147,6 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { for(var j = 0; j < w.length; j++) { - Roo.log('spliting;;;'); - var size_cls = w[j].split("-"); if(!Number.isInteger(size_cls[1] * 1)) { @@ -7159,6 +7157,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { continue; } + Roo.log('returning..'); + if(!rows[i].classList.contains("col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]])) { continue; } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 913c6dd796..b6ce996a24 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -283,7 +283,7 @@ var B=Math.ceil(this.mainBody.getScroll().top);var C=this.mainBody.getHeight();i this.CSS.updateRule(D,"display","");this.CSS.updateRule(E,"display","");if(C){this.CSS.updateRule(D,"display","none");this.CSS.updateRule(E,"display","none");}this.onHeaderChange();this.onLoad();},setColumnWidth:function(A,B){if(!this.colModel.config[A]){return; }var w=B.split(" ");var C=this.el.dom.getElementsByClassName("x-col-"+A);var D=this.el.dom.getElementsByClassName("x-hcol-"+A);for(var j=0;j