Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
style cleanup. remove some underscore-specific features
- Loading branch information
Showing
1 changed file
with
20 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -96,59 +96,59 @@ | |
// result of calling bound `listener` with the parameters given to the | ||
// handler. | ||
delegate: function(eventName, selector, listener) { | ||
if (_.isFunction(selector)) { | ||
if (typeof selector === 'function') { | ||
listener = selector; | ||
selector = null; | ||
} | ||
|
||
var root = this.el, handler; | ||
if (!selector) handler = listener; | ||
else handler = function (e) { | ||
var handler = selector ? function (e) { | ||
var node = e.target || e.srcElement; | ||
for (; node && node != root; node = node.parentNode) { | ||
for (; node && node != this.el; node = node.parentNode) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
akre54
Author
Owner
|
||
if (matchesSelector.call(node, selector)) { | ||
e.delegateTarget = node; | ||
return listener.apply(this, arguments); | ||
} | ||
} | ||
}; | ||
} : listener; | ||
|
||
elementAddEventListener.call(root, eventName, handler, false); | ||
elementAddEventListener.call(this.el, eventName, handler, false); | ||
this._domEvents.push({eventName: eventName, handler: handler, listener: listener, selector: selector}); | ||
return handler; | ||
}, | ||
|
||
// Remove a single delegated event. Either `eventName` or `selector` must | ||
// be included, `selector` and `listener` are optional. | ||
undelegate: function(eventName, selector, listener) { | ||
if (_.isFunction(selector)) { | ||
if (typeof selector === 'function') { | ||
listener = selector; | ||
selector = null; | ||
} | ||
|
||
var handlers = this._domEvents; | ||
|
||
if (this.el) { | ||
_(handlers).chain() | ||
.filter(function(item) { | ||
return item.eventName === eventName && | ||
var handlers = this._domEvents.slice(); | ||
for (var i = 0, len = handlers.length; i < len; i++) { | ||
var item = handlers[i]; | ||
|
||
var match = item.eventName === eventName && | ||
(listener ? item.listener === listener : true) && | ||
(selector ? item.selector === selector : true); | ||
}) | ||
.forEach(function(item) { | ||
elementRemoveEventListener.call(this.el, item.eventName, item.handler, false); | ||
handlers.splice(_.indexOf(handlers, item), 1); | ||
}, this); | ||
|
||
if (!match) continue; | ||
|
||
elementRemoveEventListener.call(this.el, item.eventName, item.handler, false); | ||
this._domEvents.splice(_.indexOf(handlers, item), 1); | ||
} | ||
} | ||
return this; | ||
}, | ||
|
||
// Remove all events created with `delegate` from `el` | ||
undelegateEvents: function() { | ||
if (this.el) { | ||
_.each(this._domEvents, function(item) { | ||
for (var i = 0, len = this._domEvents.length; i < len; i++) { | ||
var item = this._domEvents[i]; | ||
elementRemoveEventListener.call(this.el, item.eventName, item.handler, false); | ||
}, this); | ||
}; | ||
this._domEvents = []; | ||
} | ||
return this; | ||
|
@akre54 The function is unbound, so at this point
this.el
is undefined. Thusnode != this.el
is always true and it blows through DOM up todocument
wherematchSelector
causesIllegal invocation
.