projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92843e1
)
Roo/bootstrap/panel/Content.js
author
edward
<edward@roojs.com>
Wed, 18 Apr 2018 08:49:02 +0000
(16:49 +0800)
committer
edward
<edward@roojs.com>
Wed, 18 Apr 2018 08:49:02 +0000
(16:49 +0800)
Roo/bootstrap/panel/Content.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/panel/Content.js
b/Roo/bootstrap/panel/Content.js
index
4db1d1e
..
cb0cca6
100644
(file)
--- a/
Roo/bootstrap/panel/Content.js
+++ b/
Roo/bootstrap/panel/Content.js
@@
-226,7
+226,10
@@
Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, {
this.active = active;
this.setActiveClass(active);
if(!active){
- this.fireEvent("deactivate", this);
+// this.fireEvent("deactivate", this);
+if(!this.activePanel.setActiveState(false)){
+ return;
+ }
}else{
this.fireEvent("activate", this);
}