deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use a for loop rather than for/in loop when copying events, so that code will work with an augmented Array.prototype. Fixes 7809.

Browse source
This commit is contained in:
Dave Methvin 2010-12-20 22:23:59 -05:00
parent 291b1edf44
commit 4424bda377
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/manipulation.js
View file

@ -370,14 +370,14 @@ function root( elem, cur ) {
} }
function cloneCopyEvent(orig, ret) { function cloneCopyEvent(orig, ret) {
var i = 0; var node = 0;
ret.each(function() { ret.each(function() {
if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) ) { if ( this.nodeType !== 1 || this.nodeName !== (orig[node] && orig[node].nodeName) ) {
return; return;
} }
var oldData = jQuery.data( orig[i++] ), var oldData = jQuery.data( orig[node++] ),
curData = jQuery.data( this, oldData ), curData = jQuery.data( this, oldData ),
events = oldData && oldData.events; events = oldData && oldData.events;
@ -386,8 +386,8 @@ function cloneCopyEvent(orig, ret) {
curData.events = {}; curData.events = {};
for ( var type in events ) { for ( var type in events ) {
for ( var handler in events[ type ] ) { for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data ); jQuery.event.add( this, type, events[ type ][ i ], events[ type ][ i ].data );
} }
} }
} }

3
test/unit/manipulation.js
View file

@ -1,5 +1,8 @@
module("manipulation"); module("manipulation");
// Ensure that an extended Array prototype doesn't break jQuery
Array.prototype.arrayProtoFn = function(arg) { throw("arrayProtoFn should not be called"); };
var bareObj = function(value) { return value; }; var bareObj = function(value) { return value; };
var functionReturningObj = function(value) { return (function() { return value; }); }; var functionReturningObj = function(value) { return (function() { return value; }); };