projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66c3a87
)
Roo/bootstrap/Column.js
author
Alan Knowles
<alan@roojs.com>
Tue, 3 Mar 2015 05:12:03 +0000
(13:12 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 3 Mar 2015 05:12:03 +0000
(13:12 +0800)
Roo/bootstrap/Column.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Column.js
b/Roo/bootstrap/Column.js
index
d01c501
..
3c3ad1d
100644
(file)
--- a/
Roo/bootstrap/Column.js
+++ b/
Roo/bootstrap/Column.js
@@
-36,6
+36,7
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
lg: false,
html: '',
offset: 0,
+ alert: false,
getAutoCreate : function(){
var cfg = Roo.apply({}, Roo.bootstrap.Column.superclass.getAutoCreate.call(this));
@@
-55,6
+56,12
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
cfg.cls += ' col-' + size + '-' + settings[size];
}
});
+
+ if (this.alert && ["success","info","warning", "danger"].indexOf(this.alert) > -1) {
+ cfg.cls +=' alert alert-' + this.alert;
+ }
+
+
if (this.html.length) {
cfg.html = this.html;
}