projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c971545
)
Roo/bootstrap/Column.js
author
edward
<edward@roojs.com>
Wed, 24 Feb 2016 05:05:23 +0000
(13:05 +0800)
committer
edward
<edward@roojs.com>
Wed, 24 Feb 2016 05:05:23 +0000
(13:05 +0800)
Roo/bootstrap/Column.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Column.js
b/Roo/bootstrap/Column.js
index
4e706e0
..
e1882b8
100644
(file)
--- a/
Roo/bootstrap/Column.js
+++ b/
Roo/bootstrap/Column.js
@@
-61,6
+61,7
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
cfg = {
tag: 'div',
cls: 'column'
+ html : this.html ? this.html : ''
};
var settings=this;
@@
-92,9
+93,10
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
}
- if (this.html.length) {
- cfg.html = this.html;
- }
+// if (this.html.length) {
+// cfg.html = this.html;
+// }
+
if (this.fa) {
var fasize = '';
if (this.fasize > 1) {