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.2.0 - Released 03/30/2010
[extjs.git]
/
src
/
ext-core
/
src
/
util
/
Observable.js
diff --git
a/src/util/core/Observable.js
b/src/ext-core/src/util/Observable.js
similarity index 98%
rename from
src/util/core/Observable.js
rename to
src/ext-core/src/util/Observable.js
index
dc18313
..
6ba23d5
100644
(file)
--- a/
src/util/core/Observable.js
+++ b/
src/ext-core/src/util/Observable.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.
1.1
- * Copyright(c) 2006-2010 Ext JS,
LLC
+ * Ext JS Library 3.
2.0
+ * Copyright(c) 2006-2010 Ext JS,
Inc.
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-32,7
+32,7
@@
Employee = Ext.extend(Ext.util.Observable, {
this.listeners = config.listeners;
// Call our superclass constructor to complete construction process.
this.listeners = config.listeners;
// Call our superclass constructor to complete construction process.
- Employee.superclass.constructor.call(config)
+ Employee.superclass.constructor.call(
this,
config)
}
});
</code></pre>
}
});
</code></pre>
@@
-302,7
+302,7
@@
this.addEvents('storeloaded', 'storecleared');
* @return {Boolean} True if the event is being listened for, else false
*/
hasListener : function(eventName){
* @return {Boolean} True if the event is being listened for, else false
*/
hasListener : function(eventName){
- var e = this.events[eventName];
+ var e = this.events[eventName
.toLowerCase()
];
return ISOBJECT(e) && e.listeners.length > 0;
},
return ISOBJECT(e) && e.listeners.length > 0;
},
@@
-442,13
+442,13
@@
EXTUTIL.Event.prototype = {
findListener : function(fn, scope){
var list = this.listeners,
i = list.length,
findListener : function(fn, scope){
var list = this.listeners,
i = list.length,
- l,
- s;
- while(i--) {
+ l;
+
+ scope = scope || this.obj;
+ while(i--){
l = list[i];
l = list[i];
- if(l) {
- s = l.scope;
- if(l.fn == fn && (s == scope || s == this.obj)){
+ if(l){
+ if(l.fn == fn && l.scope == scope){
return i;
}
}
return i;
}
}