mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
2.0: Remove style->cssText attroproties fallback
This commit is contained in:
parent
ccf7abafa6
commit
d96fa37666
@ -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() {
|
||||
|
@ -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",
|
||||
|
@ -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" );
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user