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

Fix #7717 and #7165. Thanks to dmethvin and iliakan for their help fixing these issues.

Browse source
This commit is contained in:
Colin Snover 2010-12-19 15:33:53 -06:00
parent 291b1edf44
commit faefbb1ad0
3 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/data.js
View file

@ -9,7 +9,7 @@ jQuery.extend({
// Please use with caution
uuid: 0,
// Unique for each copy of jQuery on the page
// Unique for each copy of jQuery on the page
expando: "jQuery" + jQuery.now(),
// The following elements throw uncatchable exceptions if you
@ -21,6 +21,10 @@ jQuery.extend({
"applet": true
},
hasData: function( elem ) {
return !elem.nodeType || (elem[ jQuery.expando ] && !jQuery.isEmptyObject(jQuery.cache[ elem[jQuery.expando] ]));
},
data: function( elem, name, data ) {
if ( !jQuery.acceptData( elem ) ) {
return;
@ -144,7 +148,7 @@ jQuery.fn.extend({
var attr = this[0].attributes, name;
for ( var i = 0, l = attr.length; i < l; i++ ) {
name = attr[i].name;
if ( name.indexOf( "data-" ) === 0 ) {
name = name.substr( 5 );
dataAttr( this[0], name, data[ name ] );

4
src/manipulation.js
View file

@ -373,12 +373,12 @@ function cloneCopyEvent(orig, ret) {
var i = 0;
ret.each(function() {
if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) ) {
if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) || !jQuery.hasData(orig[i]) ) {
return;
}
var oldData = jQuery.data( orig[i++] ),
curData = jQuery.data( this, oldData ),
curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ),
events = oldData && oldData.events;
if ( events ) {