mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
CSS: Make show/hide/toggle methods a module
Unit test changes some uses of .show() and .hide() to .css( "display", ... ),
there was already an implicit assumption in several of the existing tests.
Fixes gh-2193
Close gh-2648
(cherry picked from commit 67d7a2eefe)
Conflicts:
Gruntfile.js
src/css.js
src/css/showHide.js
test/unit/css.js
This commit is contained in:
Dave Methvin
Richard Gibson
parent
bd11778168
commit
3842246024
@ -67,7 +67,9 @@ module.exports = function( grunt ) {
|
||||
removeWith: {
|
||||
ajax: [ "manipulation/_evalUrl", "event/ajax" ],
|
||||
callbacks: [ "deferred" ],
|
||||
css: [ "effects", "dimensions", "offset" ]
|
||||
css: [ "effects", "dimensions", "offset" ],
|
||||
"css/showHide": [ "effects" ],
|
||||
sizzle: [ "css/hiddenVisibleSelectors", "effects/animatedSelector" ]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -81,7 +81,8 @@ Some example modules that can be excluded are:
|
||||
- **ajax/xhr**: The XMLHTTPRequest AJAX transport only.
|
||||
- **ajax/script**: The `<script>` AJAX transport only; used to retrieve scripts.
|
||||
- **ajax/jsonp**: The JSONP AJAX transport only; depends on the ajax/script transport.
|
||||
- **css**: The `.css()` method plus non-animated `.show()`, `.hide()` and `.toggle()`. Also removes **all** modules depending on css (including **effects**, **dimensions**, and **offset**).
|
||||
- **css**: The `.css()` method. Also removes **all** modules depending on css (including **effects**, **dimensions**, and **offset**).
|
||||
- **css/showHide**: Non-animated `.show()`, `.hide()` and `.toggle()`; can be excluded if you use classes or explicit `.css()` calls to set the `display` property. Also removes the **effects** module.
|
||||
- **deprecated**: Methods documented as deprecated but not yet removed.
|
||||
- **dimensions**: The `.width()` and `.height()` methods, including `inner-` and `outer-` variations.
|
||||
- **effects**: The `.animate()` method and its shorthands such as `.slideUp()` or `.hide("slow")`.
|
||||
|
||||
22
src/css.js
22
src/css.js
@ -13,13 +13,12 @@ define( [
|
||||
"./css/adjustCSS",
|
||||
"./css/addGetHookIf",
|
||||
"./css/support",
|
||||
"./css/showHide",
|
||||
|
||||
"./core/init",
|
||||
"./core/ready",
|
||||
"./selector" // contains
|
||||
], function( jQuery, pnum, access, rmargin, document, rcssNum, rnumnonpx, cssExpand,
|
||||
isHidden, swap, curCSS, adjustCSS, addGetHookIf, support, showHide ) {
|
||||
isHidden, swap, curCSS, adjustCSS, addGetHookIf, support ) {
|
||||
|
||||
var
|
||||
|
||||
@ -506,25 +505,6 @@ jQuery.fn.extend( {
|
||||
jQuery.style( elem, name, value ) :
|
||||
jQuery.css( elem, name );
|
||||
}, name, value, arguments.length > 1 );
|
||||
},
|
||||
show: function() {
|
||||
return showHide( this, true );
|
||||
},
|
||||
hide: function() {
|
||||
return showHide( this );
|
||||
},
|
||||
toggle: function( state ) {
|
||||
if ( typeof state === "boolean" ) {
|
||||
return state ? this.show() : this.hide();
|
||||
}
|
||||
|
||||
return this.each( function() {
|
||||
if ( isHidden( this ) ) {
|
||||
jQuery( this ).show();
|
||||
} else {
|
||||
jQuery( this ).hide();
|
||||
}
|
||||
} );
|
||||
}
|
||||
} );
|
||||
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
define( [], function() {
|
||||
define( [
|
||||
"../css/var/isHidden"
|
||||
], function( isHidden ) {
|
||||
|
||||
function showHide( elements, show ) {
|
||||
var display, elem,
|
||||
@ -41,6 +43,26 @@ function showHide( elements, show ) {
|
||||
return elements;
|
||||
}
|
||||
|
||||
return showHide;
|
||||
jQuery.fn.extend( {
|
||||
show: function() {
|
||||
return showHide( this, true );
|
||||
},
|
||||
hide: function() {
|
||||
return showHide( this );
|
||||
},
|
||||
toggle: function( state ) {
|
||||
if ( typeof state === "boolean" ) {
|
||||
return state ? this.show() : this.hide();
|
||||
}
|
||||
|
||||
return this.each( function() {
|
||||
if ( isHidden( this ) ) {
|
||||
jQuery( this ).show();
|
||||
} else {
|
||||
jQuery( this ).hide();
|
||||
}
|
||||
} );
|
||||
}
|
||||
} );
|
||||
|
||||
} );
|
||||
|
||||
@ -54,11 +54,19 @@ QUnit.test( "attributes", function( assert ) {
|
||||
|
||||
if ( jQuery.css ) {
|
||||
QUnit.test( "css", function( assert ) {
|
||||
assert.expect( 3 );
|
||||
assert.expect( 1 );
|
||||
|
||||
var div = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
|
||||
|
||||
assert.strictEqual( div.css( "width", "50px" ).css( "width" ), "50px", ".css getter/setter" );
|
||||
} );
|
||||
}
|
||||
|
||||
if ( jQuery.fn.show && jQuery.fn.hide ) {
|
||||
QUnit.test( "show/hide", function( assert ) {
|
||||
assert.expect( 2 );
|
||||
|
||||
var div = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
|
||||
|
||||
div.hide();
|
||||
assert.strictEqual( div.css( "display" ), "none", "div hidden" );
|
||||
|
||||
@ -520,6 +520,9 @@ QUnit.test( "css(Object) where values are Functions with incoming values", funct
|
||||
jQuery( "#cssFunctionTest" ).remove();
|
||||
} );
|
||||
|
||||
// .show(), .hide(), can be excluded from the build
|
||||
if ( jQuery.fn.show && jQuery.fn.hide ) {
|
||||
|
||||
QUnit.test( "show(); hide()", function( assert ) {
|
||||
assert.expect( 4 );
|
||||
|
||||
@ -683,6 +686,35 @@ QUnit.test( "show() resolves correct default display for detached nodes", functi
|
||||
span.remove();
|
||||
} );
|
||||
|
||||
QUnit.test( "hide hidden elements (bug #7141)", function( assert ) {
|
||||
assert.expect( 3 );
|
||||
|
||||
var div = jQuery( "<div style='display:none'></div>" ).appendTo( "#qunit-fixture" );
|
||||
assert.equal( div.css( "display" ), "none", "Element is hidden by default" );
|
||||
div.hide();
|
||||
assert.ok( !jQuery._data( div, "olddisplay" ), "olddisplay is undefined after hiding an already-hidden element" );
|
||||
div.show();
|
||||
assert.equal( div.css( "display" ), "block", "Show a double-hidden element" );
|
||||
|
||||
div.remove();
|
||||
} );
|
||||
|
||||
QUnit.test( "show() after hide() should always set display to initial value (#14750)", function( assert ) {
|
||||
assert.expect( 1 );
|
||||
|
||||
var div = jQuery( "<div />" ),
|
||||
fixture = jQuery( "#qunit-fixture" );
|
||||
|
||||
fixture.append( div );
|
||||
|
||||
div.css( "display", "inline" ).hide().show().css( "display", "list-item" ).hide().show();
|
||||
assert.equal( div.css( "display" ), "list-item", "should get last set display value" );
|
||||
} );
|
||||
|
||||
}
|
||||
|
||||
if ( jQuery.fn.toggle ) {
|
||||
|
||||
QUnit.test( "toggle()", function( assert ) {
|
||||
assert.expect( 9 );
|
||||
var div, oldHide,
|
||||
@ -716,18 +748,7 @@ QUnit.test( "toggle()", function( assert ) {
|
||||
jQuery.fn.hide = oldHide;
|
||||
} );
|
||||
|
||||
QUnit.test( "hide hidden elements (bug #7141)", function( assert ) {
|
||||
assert.expect( 3 );
|
||||
|
||||
var div = jQuery( "<div style='display:none'></div>" ).appendTo( "#qunit-fixture" );
|
||||
assert.equal( div.css( "display" ), "none", "Element is hidden by default" );
|
||||
div.hide();
|
||||
assert.ok( !jQuery._data( div, "display" ), "display data is undefined after hiding an already-hidden element" );
|
||||
div.show();
|
||||
assert.equal( div.css( "display" ), "block", "Show a double-hidden element" );
|
||||
|
||||
div.remove();
|
||||
} );
|
||||
}
|
||||
|
||||
QUnit.test( "jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function( assert ) {
|
||||
assert.expect( 4 );
|
||||
@ -1202,18 +1223,6 @@ QUnit.test(
|
||||
}
|
||||
);
|
||||
|
||||
QUnit.test( "show() after hide() should always set display to initial value (#14750)", function( assert ) {
|
||||
assert.expect( 1 );
|
||||
|
||||
var div = jQuery( "<div />" ),
|
||||
fixture = jQuery( "#qunit-fixture" );
|
||||
|
||||
fixture.append( div );
|
||||
|
||||
div.css( "display", "inline" ).hide().show().css( "display", "list-item" ).hide().show();
|
||||
assert.equal( div.css( "display" ), "list-item", "should get last set display value" );
|
||||
} );
|
||||
|
||||
// Support: IE < 11
|
||||
// We have to jump through the hoops here in order to test work with "order" CSS property,
|
||||
// that some browsers do not support. This test is not, strictly speaking, correct,
|
||||
|
||||
@ -35,9 +35,9 @@ function testWidth( val, assert ) {
|
||||
$div = jQuery( "#nothiddendiv" );
|
||||
$div.width( val( 30 ) );
|
||||
assert.equal( $div.width(), 30, "Test set to 30 correctly" );
|
||||
$div.hide();
|
||||
$div.css( "display", "none" );
|
||||
assert.equal( $div.width(), 30, "Test hidden div" );
|
||||
$div.show();
|
||||
$div.css( "display", "" );
|
||||
$div.width( val( -1 ) ); // handle negative numbers by setting to 0 #11604
|
||||
assert.equal( $div.width(), 0, "Test negative width normalized to 0" );
|
||||
$div.css( "padding", "20px" );
|
||||
@ -56,8 +56,6 @@ function testWidth( val, assert ) {
|
||||
assert.equal( blah.width(), null, "Make sure 'null' is returned on an empty set" );
|
||||
|
||||
assert.equal( jQuery( window ).width(), document.documentElement.clientWidth, "Window width is equal to width reported by window/document." );
|
||||
|
||||
assert.expectJqData( this, $div[ 0 ], "display" );
|
||||
}
|
||||
|
||||
QUnit.test( "width()", function( assert ) {
|
||||
@ -88,9 +86,9 @@ function testHeight( val, assert ) {
|
||||
$div = jQuery( "#nothiddendiv" );
|
||||
$div.height( val( 30 ) );
|
||||
assert.equal( $div.height(), 30, "Test set to 30 correctly" );
|
||||
$div.hide();
|
||||
$div.css( "display", "none" );
|
||||
assert.equal( $div.height(), 30, "Test hidden div" );
|
||||
$div.show();
|
||||
$div.css( "display", "" );
|
||||
$div.height( val( -1 ) ); // handle negative numbers by setting to 0 #11604
|
||||
assert.equal( $div.height(), 0, "Test negative height normalized to 0" );
|
||||
$div.css( "padding", "20px" );
|
||||
@ -109,8 +107,6 @@ function testHeight( val, assert ) {
|
||||
assert.equal( blah.height(), null, "Make sure 'null' is returned on an empty set" );
|
||||
|
||||
assert.equal( jQuery( window ).height(), document.documentElement.clientHeight, "Window width is equal to width reported by window/document." );
|
||||
|
||||
assert.expectJqData( this, $div[ 0 ], "display" );
|
||||
}
|
||||
|
||||
QUnit.test( "height()", function( assert ) {
|
||||
@ -153,7 +149,7 @@ QUnit.test( "innerWidth()", function( assert ) {
|
||||
assert.equal( $div.innerWidth(), 30, "Test with margin and border" );
|
||||
$div.css( "padding", "20px" );
|
||||
assert.equal( $div.innerWidth(), 70, "Test with margin, border and padding" );
|
||||
$div.hide();
|
||||
$div.css( "display", "none" );
|
||||
assert.equal( $div.innerWidth(), 70, "Test hidden div" );
|
||||
|
||||
// reset styles
|
||||
@ -165,7 +161,6 @@ QUnit.test( "innerWidth()", function( assert ) {
|
||||
assert.equal( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
|
||||
|
||||
div.remove();
|
||||
assert.expectJqData( this, $div[ 0 ], "display" );
|
||||
} );
|
||||
|
||||
QUnit.test( "innerHeight()", function( assert ) {
|
||||
@ -188,7 +183,7 @@ QUnit.test( "innerHeight()", function( assert ) {
|
||||
assert.equal( $div.innerHeight(), 30, "Test with margin and border" );
|
||||
$div.css( "padding", "20px" );
|
||||
assert.equal( $div.innerHeight(), 70, "Test with margin, border and padding" );
|
||||
$div.hide();
|
||||
$div.css( "display", "none" );
|
||||
assert.equal( $div.innerHeight(), 70, "Test hidden div" );
|
||||
|
||||
// reset styles
|
||||
@ -200,7 +195,6 @@ QUnit.test( "innerHeight()", function( assert ) {
|
||||
assert.equal( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
|
||||
|
||||
div.remove();
|
||||
assert.expectJqData( this, $div[ 0 ], "display" );
|
||||
} );
|
||||
|
||||
QUnit.test( "outerWidth()", function( assert ) {
|
||||
@ -227,7 +221,7 @@ QUnit.test( "outerWidth()", function( assert ) {
|
||||
assert.equal( $div.outerWidth(), 74, "Test with padding, border and margin without margin option" );
|
||||
$div.css( "position", "absolute" );
|
||||
assert.equal( $div.outerWidth( true ), 94, "Test with padding, border and margin with margin option" );
|
||||
$div.hide();
|
||||
$div.css( "display", "none" );
|
||||
assert.equal( $div.outerWidth( true ), 94, "Test hidden div with padding, border and margin with margin option" );
|
||||
|
||||
// reset styles
|
||||
@ -239,7 +233,6 @@ QUnit.test( "outerWidth()", function( assert ) {
|
||||
assert.equal( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
|
||||
|
||||
div.remove();
|
||||
assert.expectJqData( this, $div[ 0 ], "display" );
|
||||
} );
|
||||
|
||||
QUnit.test( "child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height() see #9441 #9300", function( assert ) {
|
||||
@ -383,7 +376,7 @@ QUnit.test( "outerHeight()", function( assert ) {
|
||||
$div.css( "margin", "10px" );
|
||||
assert.equal( $div.outerHeight(), 74, "Test with padding, border and margin without margin option" );
|
||||
assert.equal( $div.outerHeight( true ), 94, "Test with padding, border and margin with margin option" );
|
||||
$div.hide();
|
||||
$div.css( "display", "none" );
|
||||
assert.equal( $div.outerHeight( true ), 94, "Test hidden div with padding, border and margin with margin option" );
|
||||
|
||||
// reset styles
|
||||
@ -395,7 +388,6 @@ QUnit.test( "outerHeight()", function( assert ) {
|
||||
assert.equal( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
|
||||
|
||||
div.remove();
|
||||
assert.expectJqData( this, $div[ 0 ], "display" );
|
||||
} );
|
||||
|
||||
QUnit.test( "passing undefined is a setter #5571", function( assert ) {
|
||||
|
||||
@ -223,6 +223,8 @@ QUnit.asyncTest( "fn.promise( \"queue\" ) - called whenever last queue function
|
||||
foo.dequeue( "queue" );
|
||||
} );
|
||||
|
||||
if ( jQuery.fn.animate ) {
|
||||
|
||||
QUnit.asyncTest( "fn.promise( \"queue\" ) - waits for animation to complete before resolving", 2, function( assert ) {
|
||||
var foo = jQuery( "#foo" ),
|
||||
test = 1;
|
||||
@ -243,6 +245,7 @@ QUnit.asyncTest( "fn.promise( \"queue\" ) - waits for animation to complete befo
|
||||
} );
|
||||
|
||||
} );
|
||||
}
|
||||
|
||||
QUnit.test( ".promise(obj)", function( assert ) {
|
||||
assert.expect( 2 );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user