projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e9ffa46
)
Roo/bootstrap/Column.js
author
Alan Knowles
<alan@roojs.com>
Wed, 29 Jan 2014 14:50:20 +0000
(22:50 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 29 Jan 2014 14:50:20 +0000
(22:50 +0800)
Roo/bootstrap/Column.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Column.js
b/Roo/bootstrap/Column.js
index
0fedf33
..
7f37ff0
100644
(file)
--- a/
Roo/bootstrap/Column.js
+++ b/
Roo/bootstrap/Column.js
@@
-29,7
+29,7
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
sm: null,
md: null,
lg: null,
-
+ html: '',
offset: 0,
getAutoCreate : function(){
@@
-46,6
+46,9
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
cfg.cls += ' col-' + size + '-' + settings[size];
}
});
+ if (this.html.length) {
+ cfg.html = html;
+ }
return cfg;
}