X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FEventManager.js;h=80c03001d5edf5d6f604b5278e21e4a3353a655c;hb=refs%2Fheads%2Fwip_leon_T7094_logo_image_upload_in_boilerplate;hp=959ccd04ece0e4ef05f262aae51504cf3bfaa462;hpb=c765697040dc218ad87cb870a4e8dfd8e5844e2b;p=roojs1 diff --git a/Roo/EventManager.js b/Roo/EventManager.js index 959ccd04ec..80c03001d5 100644 --- a/Roo/EventManager.js +++ b/Roo/EventManager.js @@ -14,7 +14,7 @@ * Registers event handlers that want to receive a normalized EventObject instead of the standard browser event and provides * several useful events directly. * See {@link Roo.EventObject} for more details on normalized event objects. - * @singleton + * @static */ Roo.EventManager = function(){ var docReadyEvent, docReadyProcId, docReadyState = false; @@ -122,8 +122,10 @@ Roo.EventManager = function(){ } } + - var listen = function(element, ename, opt, fn, scope){ + var listen = function(element, ename, opt, fn, scope) + { var o = (!opt || typeof opt == "boolean") ? {} : opt; fn = fn || o.fn; scope = scope || o.scope; var el = Roo.getDom(element); @@ -172,6 +174,7 @@ Roo.EventManager = function(){ if(o.buffer){ h = createBuffered(h, o); } + fn._handlers = fn._handlers || []; @@ -179,7 +182,9 @@ Roo.EventManager = function(){ - E.on(el, ename, h); + E.on(el, ename, h); // this adds the actuall listener to the object.. + + if(ename == "mousewheel" && el.addEventListener){ // workaround for jQuery el.addEventListener("DOMMouseScroll", h, false); E.on(window, 'unload', function(){ @@ -365,16 +370,18 @@ el.on({ * @param {Object} scope An object that becomes the scope of the handler * @param {boolean} options */ - onWindowResize : function(fn, scope, options){ + onWindowResize : function(fn, scope, options) + { if(!resizeEvent){ resizeEvent = new Roo.util.Event(); resizeTask = new Roo.util.DelayedTask(function(){ resizeEvent.fire(D.getViewWidth(), D.getViewHeight()); }); - E.on(window, "resize", function(){ - if(Roo.isIE){ + E.on(window, "resize", function() + { + if (Roo.isIE) { resizeTask.delay(50); - }else{ + } else { resizeEvent.fire(D.getViewWidth(), D.getViewHeight()); } }); @@ -524,6 +531,8 @@ Roo.onReady(function(){ var cls = [ Roo.isIE ? "roo-ie" + : Roo.isIE11 ? "roo-ie11" + : Roo.isEdge ? "roo-edge" : Roo.isGecko ? "roo-gecko" : Roo.isOpera ? "roo-opera" : Roo.isSafari ? "roo-safari" : ""]; @@ -569,7 +578,7 @@ Roo.onReady(function(){ Roo.EventManager.on("myDiv", 'click', handleClick); Roo.EventManager.addListener("myDiv", 'click', handleClick); - * @singleton + * @static */ Roo.EventObject = function(){ @@ -667,9 +676,6 @@ Roo.EventObject = function(){ DOWN : 40, /** Key constant * @type Number */ - MINUS : 45, - /** Key constant - * @type Number */ DELETE : 46, /** Key constant * @type Number */