Skip to content

Commit

Permalink
Move Element.Delegation into Element.Event.Pseudos
Browse files Browse the repository at this point in the history
  • Loading branch information
Arian committed Aug 6, 2011
1 parent da22b76 commit 6d5858e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 36 deletions.
10 changes: 4 additions & 6 deletions Source/Class/Events.Pseudos.js
Expand Up @@ -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){
Expand Down
26 changes: 0 additions & 26 deletions Source/Element/Element.Delegation.js

This file was deleted.

6 changes: 3 additions & 3 deletions Source/Element/Element.Event.Pseudos.js
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion package.yml
Expand Up @@ -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"
Expand Down

0 comments on commit 6d5858e

Please sign in to comment.