Skip to content
Permalink
Browse files

Resolved conflict

  • Loading branch information
rwaldron committed Dec 31, 2012
1 parent d96fa37 commit d50c18e61f1e498b21e64fd64f847463959061a1
Showing with 1 addition and 45 deletions.
  1. +0 −40 src/attributes.js
  2. +1 −5 src/support.js
@@ -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
if ( !jQuery.support.checkOn ) {
jQuery.each([ "radio", "checkbox" ], function() {
@@ -5,7 +5,7 @@ jQuery.support = (function() {

// Setup
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
all = div.getElementsByTagName("*");
@@ -35,10 +35,6 @@ jQuery.support = (function() {
// This requires a wrapper element in IE
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
// (IE uses filter instead)
// Use a regex to work around a WebKit issue. See #5145

0 comments on commit d50c18e

Please sign in to comment.
You can’t perform that action at this time.