Merge branch 'bug7524' of https://github.com/csnover/jquery into csnover-bug7524

This commit is contained in:
John Resig 2010-12-06 17:24:13 -05:00
commit 8943b427f6
2 changed files with 13 additions and 8 deletions

View file

@ -138,15 +138,17 @@ jQuery.fn.extend({
if ( typeof key === "undefined" ) {
if ( this.length ) {
var attr = this[0].attributes, name;
data = jQuery.data( this[0] );
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 ] );
if ( this[0].nodeType === 1 ) {
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 ] );
}
}
}
}