Merge branch 'master' of git://github.com/jquery/jquery

This commit is contained in:
David Petersen 2010-10-07 20:55:47 -04:00
commit 3bd737e81a
4 changed files with 11 additions and 8 deletions

View file

@ -204,7 +204,7 @@ if ( !jQuery.support.opacity ) {
style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
opacity;
style.filter + ' ' + opacity;
}
};
}

View file

@ -121,7 +121,7 @@ jQuery.extend({
// A method for determining if a DOM node can handle the data expando
acceptData: function( elem ) {
if ( elem.nodeName ) {
match = jQuery.noData[ elem.nodeName.toLowerCase() ];
var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
if ( match ) {
return !(match === true || elem.getAttribute("classid") !== match);