library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2.0: Remove style->cssText attroproties fallback

Browse Source
This commit is contained in:
Timmy Willison 2012-12-17 18:17:45 -05:00 committed by Rick Waldron
parent ccf7abafa6
commit d96fa37666
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/attributes.js
View File

@ -596,6 +596,7 @@ if ( !jQuery.support.hrefNormalized ) {
}); });
} }
<<<<<<< HEAD
if ( !jQuery.support.style ) { if ( !jQuery.support.style ) {
jQuery.attrHooks.style = { jQuery.attrHooks.style = {
get: function( elem ) { get: function( elem ) {
@ -610,6 +611,8 @@ if ( !jQuery.support.style ) {
}; };
} }
=======
>>>>>>> 2.0: Remove style->cssText attroproties fallback
// Radios and checkboxes getter/setter // Radios and checkboxes getter/setter
if ( !jQuery.support.checkOn ) { if ( !jQuery.support.checkOn ) {
jQuery.each([ "radio", "checkbox" ], function() { jQuery.each([ "radio", "checkbox" ], function() {

6
src/support.js
View File

@ -19,7 +19,7 @@ jQuery.support = (function() {
opt = select.appendChild( document.createElement("option") ); opt = select.appendChild( document.createElement("option") );
input = div.getElementsByTagName("input")[ 0 ]; input = div.getElementsByTagName("input")[ 0 ];
a.style.cssText = "top:1px;float:left;opacity:.5"; a.style.cssText = "float:left;opacity:.5";
support = { support = {
// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
getSetAttribute: div.className !== "t", getSetAttribute: div.className !== "t",
@ -35,10 +35,6 @@ jQuery.support = (function() {
// This requires a wrapper element in IE // This requires a wrapper element in IE
htmlSerialize: !!div.getElementsByTagName("link").length, 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 // Make sure that URLs aren't manipulated
// (IE normalizes it by default) // (IE normalizes it by default)
hrefNormalized: a.getAttribute("href") === "/a", hrefNormalized: a.getAttribute("href") === "/a",

4
test/unit/attributes.js
View File

@ -46,10 +46,6 @@ test( "jQuery.propFix integrity test", function() {
"contenteditable": "contentEditable" "contenteditable": "contentEditable"
}; };
if ( !jQuery.support.enctype ) {
props.enctype = "encoding";
}
deepEqual( props, jQuery.propFix, "jQuery.propFix passes integrity check" ); deepEqual( props, jQuery.propFix, "jQuery.propFix passes integrity check" );
}); });