projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #6883 - image loading tidy up
[roojs1]
/
Roo
/
bootstrap
/
Component.js
diff --git
a/Roo/bootstrap/Component.js
b/Roo/bootstrap/Component.js
index
efd739f
..
d2632d5
100644
(file)
--- a/
Roo/bootstrap/Component.js
+++ b/
Roo/bootstrap/Component.js
@@
-117,11
+117,11
@@
Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, {
}
if (this.cls) {
}
if (this.cls) {
- cfg.cls = (typeof(cfg.cls) == 'undefined'
) ? this.cls : cfg.cls
+ ' ' + this.cls;
+ cfg.cls = (typeof(cfg.cls) == 'undefined'
? this.cls : cfg.cls)
+ ' ' + this.cls;
}
if (this.style) { // fixme needs to support more complex style data.
}
if (this.style) { // fixme needs to support more complex style data.
- cfg.style = this.style;
+ cfg.style =
(typeof(cfg.style) == 'undefined' ? this.style : cfg.style) + '; ' +
this.style;
}
if(this.name){
}
if(this.name){