diff --git a/Source/Class/Events.Pseudos.js b/Source/Class/Events.Pseudos.js index 77e462f3..1baa89c0 100644 --- a/Source/Class/Events.Pseudos.js +++ b/Source/Class/Events.Pseudos.js @@ -72,24 +72,22 @@ Events.Pseudos = function(pseudos, addEvent, removeEvent){ eventType = split[0].event, args = Array.slice(arguments, 2), stack = fn, - self = this, - monitor; + self = this; split.each(function(item){ var listener = item.listener, stackFn = stack; if (listener == false) eventType += ':' + item.pseudo + '(' + item.value + ')'; else stack = function(){ - listener.call(self, item, stackFn, arguments, monitor); + listener.call(self, item, stackFn, arguments, stack); }; }); - monitor = stack.bind(this); - events.include({type: eventType, event: fn, monitor: monitor}); + events.include({type: eventType, event: fn, monitor: stack}); storage.store(type, events); if (type != eventType) addEvent.apply(this, [type, fn].concat(args)); - return addEvent.apply(this, [eventType, monitor].concat(args)); + return addEvent.apply(this, [eventType, stack].concat(args)); }, removeEvent: function(type, fn){ diff --git a/Source/Element/Element.Delegation.js b/Source/Element/Element.Delegation.js deleted file mode 100644 index 1b579976..00000000 --- a/Source/Element/Element.Delegation.js +++ /dev/null @@ -1,26 +0,0 @@ -/* ---- - -script: Element.Delegation.js - -name: Element.Delegation - -description: Extends the Element native object to include the delegate method for more efficient event management. - -credits: - - "Event checking based on the work of Daniel Steigerwald. License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz" - -license: MIT-style license - -authors: - - Aaron Newton - - Daniel Steigerwald - -requires: [Core/Element.Delegation, /MooTools.More, Element.Event.Pseudos] - -provides: [Element.Delegation] - -... -*/ - -Event.definePseudo('relay', false); diff --git a/Source/Element/Element.Event.Pseudos.js b/Source/Element/Element.Event.Pseudos.js index 66747b60..4241903b 100644 --- a/Source/Element/Element.Event.Pseudos.js +++ b/Source/Element/Element.Event.Pseudos.js @@ -10,16 +10,16 @@ license: MIT-style license authors: - Arian Stolwijk -requires: [Core/Element.Event, Events.Pseudos] +requires: [Core/Element.Event, Core/Element.Delegation, Events.Pseudos] -provides: [Element.Event.Pseudos] +provides: [Element.Event.Pseudos, Element.Delegation] ... */ (function(){ -var pseudos = {}, +var pseudos = {relay: false}, copyFromEvents = ['once', 'throttle', 'pause'], count = copyFromEvents.length; diff --git a/package.yml b/package.yml index 0c850620..ee0fb413 100644 --- a/package.yml +++ b/package.yml @@ -36,7 +36,6 @@ sources: - "Source/Element/Elements.From.js" - "Source/Element/Element.Event.Pseudos.js" - "Source/Element/Element.Event.Pseudos.Keys.js" - - "Source/Element/Element.Delegation.js" - "Source/Element/Element.Measure.js" - "Source/Element/Element.Pin.js" - "Source/Element/Element.Position.js"