2.0: Remove style->cssText attroproties fallback

timmywil · rwaldron · commit d96fa37666dd · 2012-12-31T13:21:47.000-05:00
diff --git 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
@@ -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
@@ -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" );
 });
 

Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,7 @@ if ( !jQuery.support.hrefNormalized ) {`
`596`	`596`	`});`
`597`	`597`	`}`
`598`	`598`
	`599`	`+<<<<<<< HEAD`
`599`	`600`	`if ( !jQuery.support.style ) {`
`600`	`601`	`jQuery.attrHooks.style = {`
`601`	`602`	`get: function( elem ) {`
`@@ -610,6 +611,8 @@ if ( !jQuery.support.style ) {`
`610`	`611`	`};`
`611`	`612`	`}`
`612`	`613`
	`614`	`+=======`
	`615`	`+>>>>>>> 2.0: Remove style->cssText attroproties fallback`
`613`	`616`	`// Radios and checkboxes getter/setter`
`614`	`617`	`if ( !jQuery.support.checkOn ) {`
`615`	`618`	`jQuery.each([ "radio", "checkbox" ], function() {`