projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Roo/bootstrap/Column.js
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
af07eb4
..
0962d72
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-916,7
+916,7
@@
Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component, {
}
if (this.icon) {
- cfg.html = '<i class="glyphicon glyphicon-'+this.icon + '"></i>' +
+
(cfg.html || '');
+ cfg.html = '<i class="glyphicon glyphicon-'+this.icon + '"></i>' + (cfg.html || '');
}
return cfg;