2.0: Remove style->cssText attroproties fallback

diff --git a/src/attributes.js b/src/attributes.js
index f9475236835e2d3b19ae005dfa46727436e9fadb..7f156f2c3deb28b9419446dbc7df8433c058e69e 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -596,6 +596,7 @@ if ( !jQuery.support.hrefNormalized ) {
        });
 }
 
+<<<<<<< HEAD
 if ( !jQuery.support.style ) {
        jQuery.attrHooks.style = {
                get: function( elem ) {
@@ -610,6 +611,8 @@ if ( !jQuery.support.style ) {
        };
 }
 
+=======
+>>>>>>> 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 d1a8d3d3821d936ef6cfeef6a7bca35852ce5040..4c4b6ea77d18fe8bbc1c6a4b21c26155f895c11a 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -19,7 +19,7 @@ jQuery.support = (function() {
        opt = select.appendChild( document.createElement("option") );
        input = div.getElementsByTagName("input")[ 0 ];
 
-       a.style.cssText = "top:1px;float:left;opacity:.5";
+       a.style.cssText = "float:left;opacity:.5";
        support = {
                // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
                getSetAttribute: div.className !== "t",
@@ -35,10 +35,6 @@ jQuery.support = (function() {
                // This requires a wrapper element in IE
                htmlSerialize: !!div.getElementsByTagName("link").length,
 
-               // Get the style information from getAttribute
-               // (IE uses .cssText instead)
-               style: /top/.test( a.getAttribute("style") ),
-
                // Make sure that URLs aren't manipulated
                // (IE normalizes it by default)
                hrefNormalized: a.getAttribute("href") === "/a",

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 072240049cdad4bf36a2d34e941737a674e63a91..883ba50ef501d3f3135bdf34a694971ec60dd759 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -46,10 +46,6 @@ test( "jQuery.propFix integrity test", function() {
                "contenteditable": "contentEditable"
        };
 
-       if ( !jQuery.support.enctype ) {
-               props.enctype = "encoding";
-       }
-
        deepEqual( props, jQuery.propFix, "jQuery.propFix passes integrity check" );
 });