Resolved conflict

diff --git a/src/attributes.js b/src/attributes.js
index 7f156f2c3deb28b9419446dbc7df8433c058e69e..ec39843300d6eeaa867532e83a8d5e7320b26026 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.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() {

diff --git a/src/support.js b/src/support.js
index 4c4b6ea77d18fe8bbc1c6a4b21c26155f895c11a..9d8ed46da01b6ab8dcbf3b2fd2a229c28d6b82df 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -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