Ref #8908, gh-886. Avoid clone identity crisis in IE9/10. Close gh-1036.

This commit is contained in:
Oleg 2012-11-19 02:03:38 +04:00 committed by Dave Methvin
parent ca26d45395
commit 643ecf9d63
5 changed files with 86 additions and 87 deletions

View File

@ -211,6 +211,12 @@ jQuery.extend({
value += "px"; value += "px";
} }
// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
// but it would mean to define eight (for every problematic property) identical functions
if ( value === "" && name.indexOf("background") === 0 ) {
value = " ";
}
// If a hook was provided, use that value, otherwise just set the specified value // If a hook was provided, use that value, otherwise just set the specified value
if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) { if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
@ -543,15 +549,6 @@ jQuery.each([ "height", "width" ], function( i, name ) {
}; };
}); });
if ( !jQuery.support.clearCloneStyle ) {
// #8908, this part for IE9 only; see gh-886
jQuery.cssHooks.backgroundPosition = {
set: function( elem, value ) {
return value === "" ? "0% 0%" : value;
}
};
}
if ( !jQuery.support.opacity ) { if ( !jQuery.support.opacity ) {
jQuery.cssHooks.opacity = { jQuery.cssHooks.opacity = {
get: function( elem, computed ) { get: function( elem, computed ) {

View File

@ -433,7 +433,7 @@ function cloneCopyEvent( src, dest ) {
} }
} }
function cloneFixAttributes( src, dest ) { function fixCloneNodeIssues( src, dest ) {
var nodeName, data, e; var nodeName, data, e;
// We do not need to do anything for non-Elements // We do not need to do anything for non-Elements
@ -559,12 +559,8 @@ jQuery.extend({
inPage = jQuery.contains( elem.ownerDocument, elem ); inPage = jQuery.contains( elem.ownerDocument, elem );
if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
// Break the original-clone style connection in IE9/10 (#8909)
if ( !jQuery.support.clearCloneStyle && elem.nodeType === 1 ) {
i = ( window.getComputedStyle( elem, null ) || {} ).backgroundPosition;
}
clone = elem.cloneNode( true ); clone = elem.cloneNode( true );
// IE<=8 does not properly clone detached, unknown element nodes // IE<=8 does not properly clone detached, unknown element nodes
} else { } else {
fragmentDiv.innerHTML = elem.outerHTML; fragmentDiv.innerHTML = elem.outerHTML;
@ -582,7 +578,7 @@ jQuery.extend({
for ( i = 0; (node = srcElements[i]) != null; ++i ) { for ( i = 0; (node = srcElements[i]) != null; ++i ) {
// Ensure that the destination node is not null; Fixes #9587 // Ensure that the destination node is not null; Fixes #9587
if ( destElements[i] ) { if ( destElements[i] ) {
cloneFixAttributes( node, destElements[i] ); fixCloneNodeIssues( node, destElements[i] );
} }
} }
} }

View File

@ -169,10 +169,6 @@ jQuery.support = (function() {
} }
} }
div.style.backgroundClip = "content-box";
div.cloneNode( true ).style.backgroundClip = "";
support.clearCloneStyle = div.style.backgroundClip === "content-box";
// Run tests that need a body at doc ready // Run tests that need a body at doc ready
jQuery(function() { jQuery(function() {
var container, div, tds, marginDiv, var container, div, tds, marginDiv,

View File

@ -923,4 +923,81 @@ test( "css opacity consistency across browsers (#12685)", function() {
equal( Math.round( el.css("opacity") * 100 ), 20, "remove opacity override" ); equal( Math.round( el.css("opacity") * 100 ), 20, "remove opacity override" );
}); });
asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Element's Style (#8908)", 16, function() {
var baseUrl = document.location.href.replace( /([^\/]*)$/, "" ),
styles = [{
name: "backgroundAttachment",
value: ["fixed"],
expected: [ "scroll" ]
},{
name: "backgroundColor",
value: [ "rgb(255, 0, 0)", "rgb(255,0,0)", "#ff0000" ],
expected: ["transparent"]
}, {
// Firefox returns auto's value
name: "backgroundImage",
value: [ "url('test.png')", "url(" + baseUrl + "test.png)", "url(\"" + baseUrl + "test.png\")" ],
expected: [ "none", "url(\"http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif\")" ]
}, {
name: "backgroundPosition",
value: ["5% 5%"],
expected: [ "0% 0%", "-1000px 0px", "-1000px 0%" ]
}, {
// Firefox returns no-repeat
name: "backgroundRepeat",
value: ["repeat-y"],
expected: [ "repeat", "no-repeat" ]
}, {
name: "backgroundClip",
value: ["padding-box"],
expected: ["border-box"]
}, {
name: "backgroundOrigin",
value: ["content-box"],
expected: ["padding-box"]
}, {
name: "backgroundSize",
value: ["80px 60px"],
expected: [ "auto auto" ]
}];
jQuery.each( styles, function(index, style) {
var $clone, $clonedChildren,
$source = jQuery( "#firstp" ),
source = $source[ 0 ],
$children = $source.children();
style.expected = style.expected.concat( [ "", "auto" ] );
if ( source.style[ style.name ] === undefined ) {
ok( true, style.name + ": style isn't supported and therefore not an issue" );
ok( true );
return true;
}
$source.css( style.name, style.value[ 0 ] );
$children.css( style.name, style.value[ 0 ] );
$clone = $source.clone();
$clonedChildren = $clone.children();
$clone.css( style.name, "" );
$clonedChildren.css( style.name, "" );
window.setTimeout(function() {
ok( jQuery.inArray( $source.css( style.name ) !== -1, style.value ),
"Clearing clone.css() doesn't affect source.css(): " + style.name +
"; result: " + $source.css( style.name ) +
"; expected: " + style.value.join( "," ) );
ok( jQuery.inArray( $children.css( style.name ) !== -1, style.value ),
"Clearing clonedChildren.css() doesn't affect children.css(): " + style.name +
"; result: " + $children.css( style.name ) +
"; expected: " + style.value.join( "," ) );
}, 100 );
});
window.setTimeout( start, 1000 );
});
} }

View File

@ -2127,73 +2127,6 @@ test( "checked state is cloned with clone()", function() {
equal( jQuery(elem).clone().attr("id","clone")[ 0 ].checked, true, "Checked true state correctly cloned" ); equal( jQuery(elem).clone().attr("id","clone")[ 0 ].checked, true, "Checked true state correctly cloned" );
}); });
test( "Clearing a Cloned Element's Style Shouldn't Clear the Original Element's Style (#8908)", function() {
expect( 16 );
var baseUrl = document.location.href.replace( /([^\/]*)$/, "" ),
styles = [{
name: "backgroundAttachment",
value: ["fixed"],
expected: [ "scroll" ]
},{
name: "backgroundColor",
value: [ "rgb(255, 0, 0)", "rgb(255,0,0)", "#ff0000" ],
expected: ["transparent"]
}, {
// Firefox returns auto's value
name: "backgroundImage",
value: [ "url('test.png')", "url(" + baseUrl + "test.png)", "url(\"" + baseUrl + "test.png\")" ],
expected: [ "none", "url(\"http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif\")" ]
}, {
name: "backgroundPosition",
value: ["5% 5%"],
expected: [ "0% 0%", "-1000px 0px", "-1000px 0%" ]
}, {
// Firefox returns no-repeat
name: "backgroundRepeat",
value: ["repeat-y"],
expected: [ "repeat", "no-repeat" ]
}, {
name: "backgroundClip",
value: ["padding-box"],
expected: ["border-box"]
}, {
name: "backgroundOrigin",
value: ["content-box"],
expected: ["padding-box"]
}, {
name: "backgroundSize",
value: ["80px 60px"],
expected: [ "auto auto" ]
}];
jQuery.each( styles, function( index, style ) {
var $source, source, $clone;
style.expected = style.expected.concat([ "", "auto" ]);
$source = jQuery( "<div />" );
source = $source[ 0 ];
if ( source.style[ style.name ] === undefined ) {
ok( true, style.name + ": style isn't supported and therefore not an issue" );
ok( true );
return true;
}
$source.css( style.name, style.value[ 0 ] );
$clone = $source.clone();
$clone.css( style.name, "" );
ok( ~jQuery.inArray( $source.css( style.name ), style.value ),
"Clearing clone.css() doesn't affect source.css(): " + style.name +
"; result: " + $source.css( style.name ) +
"; expected: " + style.value.join(",") );
ok( ~jQuery.inArray( $clone.css( style.name ), style.expected ),
"Cloned element was reset to its default value: " + style.name +
"; result: " + $clone.css( style.name ) +
"; expected: " + style.expected.join(",") );
});
});
test( "manipulate mixed jQuery and text (#12384, #12346)", function() { test( "manipulate mixed jQuery and text (#12384, #12346)", function() {
expect( 2 ); expect( 2 );