git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.1.1 - Released 02/08/2010
[extjs.git]
/
src
/
widgets
/
tree
/
TreeEventModel.js
diff --git
a/src/widgets/tree/TreeEventModel.js
b/src/widgets/tree/TreeEventModel.js
index
c1b4476
..
2d8ea42
100644
(file)
--- a/
src/widgets/tree/TreeEventModel.js
+++ b/
src/widgets/tree/TreeEventModel.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.1.
0
- * Copyright(c) 2006-20
09
Ext JS, LLC
+ * Ext JS Library 3.1.
1
+ * Copyright(c) 2006-20
10
Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-12,7
+12,7
@@
Ext.tree.TreeEventModel = function(tree){
Ext.tree.TreeEventModel.prototype = {
\r
initEvents : function(){
\r
var t = this.tree;
\r
Ext.tree.TreeEventModel.prototype = {
\r
initEvents : function(){
\r
var t = this.tree;
\r
-
\r
+
\r
if(t.trackMouseOver !== false){
\r
t.mon(t.innerCt, {
\r
scope: this,
\r
if(t.trackMouseOver !== false){
\r
t.mon(t.innerCt, {
\r
scope: this,
\r
@@
-85,12
+85,15
@@
Ext.tree.TreeEventModel.prototype = {
},
\r
\r
trackExit : function(e){
\r
},
\r
\r
trackExit : function(e){
\r
- if(this.lastOverNode && !e.within(this.lastOverNode.ui.getEl())){
\r
- this.onNodeOut(e, this.lastOverNode);
\r
+ if(this.lastOverNode){
\r
+ if(this.lastOverNode.ui && !e.within(this.lastOverNode.ui.getEl())){
\r
+ this.onNodeOut(e, this.lastOverNode);
\r
+ }
\r
delete this.lastOverNode;
\r
Ext.getBody().un('mouseover', this.trackExit, this);
\r
this.trackingDoc = false;
\r
}
\r
delete this.lastOverNode;
\r
Ext.getBody().un('mouseover', this.trackExit, this);
\r
this.trackingDoc = false;
\r
}
\r
+
\r
},
\r
\r
delegateClick : function(e, t){
\r
},
\r
\r
delegateClick : function(e, t){
\r
@@
-112,7
+115,7
@@
Ext.tree.TreeEventModel.prototype = {
if(this.getNodeTarget(e)){
\r
this.onNodeDblClick(e, this.getNode(e));
\r
}else{
\r
if(this.getNodeTarget(e)){
\r
this.onNodeDblClick(e, this.getNode(e));
\r
}else{
\r
- this.onContainerEvent(e, 'dblclick');
\r
+ this.onContainerEvent(e, 'dblclick');
\r
}
\r
}
\r
},
\r
}
\r
}
\r
},
\r
@@
-122,13
+125,13
@@
Ext.tree.TreeEventModel.prototype = {
if(this.getNodeTarget(e)){
\r
this.onNodeContextMenu(e, this.getNode(e));
\r
}else{
\r
if(this.getNodeTarget(e)){
\r
this.onNodeContextMenu(e, this.getNode(e));
\r
}else{
\r
- this.onContainerEvent(e, 'contextmenu');
\r
+ this.onContainerEvent(e, 'contextmenu');
\r
}
\r
}
\r
},
\r
}
\r
}
\r
},
\r
-
\r
+
\r
onContainerEvent: function(e, type){
\r
onContainerEvent: function(e, type){
\r
- this.tree.fireEvent('container' + type, this.tree, e);
\r
+ this.tree.fireEvent('container' + type, this.tree, e);
\r
},
\r
\r
onNodeClick : function(e, node){
\r
},
\r
\r
onNodeClick : function(e, node){
\r
@@
-169,7
+172,8
@@
Ext.tree.TreeEventModel.prototype = {
},
\r
\r
beforeEvent : function(e){
\r
},
\r
\r
beforeEvent : function(e){
\r
- if(this.disabled){
\r
+ var node = this.getNode(e);
\r
+ if(this.disabled || !node || !node.ui){
\r
e.stopEvent();
\r
return false;
\r
}
\r
e.stopEvent();
\r
return false;
\r
}
\r