X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/2e847cf21b8ab9d15fa167b315ca5b2fa92638fc:/src/util/core/Observable.js..6a7e4474cba9d8be4b2ec445e10f1691f7277c50:/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 dc18313a..6ba23d5d 100644 --- 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 */ @@ -32,7 +32,7 @@ Employee = Ext.extend(Ext.util.Observable, { this.listeners = config.listeners; // Call our superclass constructor to complete construction process. - Employee.superclass.constructor.call(config) + Employee.superclass.constructor.call(this, config) } }); @@ -302,7 +302,7 @@ this.addEvents('storeloaded', 'storecleared'); * @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; }, @@ -442,13 +442,13 @@ EXTUTIL.Event.prototype = { 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]; - 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; } }