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

Fix #14394: Changing style !important in webkit. Close gh-1385.

Browse Source 
(cherry picked from commit 24e587929f)

Conflicts:

	src/css.js
This commit is contained in:
Lihan Li 2013-09-29 12:06:32 -04:00 committed by Richard Gibson
parent 1ceecf4c64
commit a5063ee2a1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/css.js
View File

@ -292,9 +292,12 @@ jQuery.extend({
// 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 ) {
// Wrapped to prevent IE from throwing errors when 'invalid' values are provided // Support: IE
// Fixes bug #5509 // Swallow errors from 'invalid' CSS values (#5509)
try { try {
// Support: Chrome, Safari
// Setting style to blank string required to delete "style: x !important;"
style[ name ] = "";
style[ name ] = value; style[ name ] = value;
} catch(e) {} } catch(e) {}
} }

6
test/unit/css.js
View File

@ -970,6 +970,12 @@ test( ":visible/:hidden selectors", function() {
t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] ); t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] );
}); });
test( "Override !important when changing styles (#14394)", function() {
expect( 1 );
var el = jQuery( "<div style='display: block !important;'></div>" ).css( "display", "none" );
equal( el.css( "display" ), "none", "New style replaced !important" );
});
asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Element's Style (#8908)", 24, function() { asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Element's Style (#8908)", 24, function() {
var baseUrl = document.location.href.replace( /([^\/]*)$/, "" ), var baseUrl = document.location.href.replace( /([^\/]*)$/, "" ),
styles = [{ styles = [{