library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved conflict

Browse Source
This commit is contained in:
Rick Waldron 2012-12-31 13:23:26 -05:00
parent d96fa37666
commit d50c18e61f
2 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/attributes.js
View File

@ -573,46 +573,6 @@ if ( !getSetAttribute ) {
}); });
} }
// Some attributes require a special call on IE
// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
if ( !jQuery.support.hrefNormalized ) {
jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
get: function( elem ) {
var ret = elem.getAttribute( name, 2 );
return ret == null ? undefined : ret;
}
});
});
// href/src property should get the full normalized URL (#10299/#12915)
jQuery.each([ "href", "src" ], function( i, name ) {
jQuery.propHooks[ name ] = {
get: function( elem ) {
return elem.getAttribute( name, 4 );
}
};
});
}
<<<<<<< HEAD
if ( !jQuery.support.style ) {
jQuery.attrHooks.style = {
get: function( elem ) {
// Return undefined in the case of empty string
// Note: IE uppercases css property names, but if we were to .toLowerCase()
// .cssText, that would destroy case senstitivity in URL's, like in "background"
return elem.style.cssText || undefined;
},
set: function( elem, value ) {
return ( elem.style.cssText = value + "" );
}
};
}
=======
>>>>>>> 2.0: Remove style->cssText attroproties fallback
// Radios and checkboxes getter/setter // Radios and checkboxes getter/setter
if ( !jQuery.support.checkOn ) { if ( !jQuery.support.checkOn ) {
jQuery.each([ "radio", "checkbox" ], function() { jQuery.each([ "radio", "checkbox" ], function() {

6
src/support.js
View File

@ -5,7 +5,7 @@ jQuery.support = (function() {
// Setup // Setup
div.setAttribute( "className", "t" ); div.setAttribute( "className", "t" );
div.innerHTML = " <link/><table></table><a href='/a'>a</a><input type='checkbox'/>"; div.innerHTML = " <link/><table></table><a>a</a><input type='checkbox'/>";
// Support tests won't run in some limited or non-browser environments // Support tests won't run in some limited or non-browser environments
all = div.getElementsByTagName("*"); all = div.getElementsByTagName("*");
@ -35,10 +35,6 @@ jQuery.support = (function() {
// This requires a wrapper element in IE // This requires a wrapper element in IE
htmlSerialize: !!div.getElementsByTagName("link").length, htmlSerialize: !!div.getElementsByTagName("link").length,
// Make sure that URLs aren't manipulated
// (IE normalizes it by default)
hrefNormalized: a.getAttribute("href") === "/a",
// Make sure that element opacity exists // Make sure that element opacity exists
// (IE uses filter instead) // (IE uses filter instead)
// Use a regex to work around a WebKit issue. See #5145 // Use a regex to work around a WebKit issue. See #5145