projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e777bfa
)
Roo/bootstrap/Component.js
author
Alan Knowles
<alan@roojs.com>
Fri, 13 Jul 2018 06:03:31 +0000
(14:03 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 13 Jul 2018 06:03:31 +0000
(14:03 +0800)
Roo/bootstrap/Component.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Component.js
b/Roo/bootstrap/Component.js
index
cd52d8a
..
392c626
100644
(file)
--- a/
Roo/bootstrap/Component.js
+++ b/
Roo/bootstrap/Component.js
@@
-370,16
+370,16
@@
Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, {
{
if (typeof(this.visibilityEl) == 'object') {
{
if (typeof(this.visibilityEl) == 'object') {
- return this.visibilityEl;
+ return this.visibilityEl
.getEl()
;
}
if (typeof(this.visibilityEl) == 'string') {
}
if (typeof(this.visibilityEl) == 'string') {
- return this.visibilityEl == 'parent' ? this.parent()
?
this.getEl();
+ return this.visibilityEl == 'parent' ? this.parent()
.getEl() :
this.getEl();
}
return this.getEl();
}
return this.getEl();
- }
+ }
,
/**
* Show a component - removes 'hidden' class
/**
* Show a component - removes 'hidden' class
@@
-391,12
+391,8
@@
Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, {
}
this.getEl().removeClass('hidden');
}
this.getEl().removeClass('hidden');
+ this.getVisibilityEl().removeClass('hidden');
- if(!this.hideParent){
- return;
- }
-
- this.parent().getEl().removeClass('hidden');
},
/**
},
/**