From 079e0796aef76a384d99df3d9a398e9890af6991 Mon Sep 17 00:00:00 2001
From: Oleg Gaidarenko <markelog@gmail.com>
Date: Tue, 22 Dec 2015 14:24:15 +0300
Subject: [PATCH] Revert "CSS: Make show/hide/toggle methods a module"

This reverts commit 3842246024475eafdc8a00a7ac4358d06d76cab2.
---
 Gruntfile.js            |  4 +--
 README.md               |  3 +--
 src/css.js              | 22 +++++++++++++++-
 src/css/showHide.js     | 28 ++------------------
 test/unit/basic.js      | 10 +-------
 test/unit/css.js        | 57 +++++++++++++++++------------------------
 test/unit/dimensions.js | 24 +++++++++++------
 test/unit/queue.js      |  3 ---
 8 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 21d103348..ced59f288 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -67,9 +67,7 @@ module.exports = function( grunt ) {
 				removeWith: {
 					ajax: [ "manipulation/_evalUrl", "event/ajax" ],
 					callbacks: [ "deferred" ],
-					css: [ "effects", "dimensions", "offset" ],
-					"css/showHide": [ "effects" ],
-					sizzle: [ "css/hiddenVisibleSelectors", "effects/animatedSelector" ]
+					css: [ "effects", "dimensions", "offset" ]
 				}
 			}
 		},
diff --git a/README.md b/README.md
index 342abdd9a..3c1b2f355 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,7 @@ 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. 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.
+- **css**: The `.css()` method plus non-animated `.show()`, `.hide()` and `.toggle()`. Also removes **all** modules depending on css (including **effects**, **dimensions**, and **offset**).
 - **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")`.
diff --git a/src/css.js b/src/css.js
index cfd0cc88a..30d6b75d1 100644
--- a/src/css.js
+++ b/src/css.js
@@ -13,12 +13,13 @@ 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 ) {
+	isHidden, swap, curCSS, adjustCSS, addGetHookIf, support, showHide ) {
 
 var
 
@@ -505,6 +506,25 @@ 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();
+			}
+		} );
 	}
 } );
 
diff --git a/src/css/showHide.js b/src/css/showHide.js
index 47d353a67..ebaef5fb4 100644
--- a/src/css/showHide.js
+++ b/src/css/showHide.js
@@ -1,8 +1,4 @@
-define( [
-	"../core",
-	"../css/var/isHidden"
-], function( jQuery, isHidden ) {
-
+define( [], function() {
 function showHide( elements, show ) {
 	var display, elem,
 		values = [],
@@ -44,26 +40,6 @@ function showHide( elements, show ) {
 	return elements;
 }
 
-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();
-			}
-		} );
-	}
-} );
+return showHide;
 
 } );
diff --git a/test/unit/basic.js b/test/unit/basic.js
index 49b518d3f..25e86d1a3 100644
--- a/test/unit/basic.js
+++ b/test/unit/basic.js
@@ -54,19 +54,11 @@ QUnit.test( "attributes", function( assert ) {
 
 if ( jQuery.css ) {
 QUnit.test( "css", function( assert ) {
-	assert.expect( 1 );
+	assert.expect( 3 );
 
 	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" );
diff --git a/test/unit/css.js b/test/unit/css.js
index c2945fc10..63a49f848 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -520,9 +520,6 @@ 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 );
 
@@ -686,35 +683,6 @@ 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,
@@ -748,7 +716,18 @@ 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 );
@@ -1223,6 +1202,18 @@ 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,
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index c9585f5ea..ef93aa7a3 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -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.css( "display", "none" );
+	$div.hide();
 	assert.equal( $div.width(), 30, "Test hidden div" );
-	$div.css( "display", "" );
+	$div.show();
 	$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,6 +56,8 @@ 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 ) {
@@ -86,9 +88,9 @@ function testHeight( val, assert ) {
 	$div = jQuery( "#nothiddendiv" );
 	$div.height( val( 30 ) );
 	assert.equal( $div.height(), 30, "Test set to 30 correctly" );
-	$div.css( "display", "none" );
+	$div.hide();
 	assert.equal( $div.height(), 30, "Test hidden div" );
-	$div.css( "display", "" );
+	$div.show();
 	$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" );
@@ -107,6 +109,8 @@ 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 ) {
@@ -149,7 +153,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.css( "display", "none" );
+	$div.hide();
 	assert.equal( $div.innerWidth(), 70, "Test hidden div" );
 
 	// reset styles
@@ -161,6 +165,7 @@ 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 ) {
@@ -183,7 +188,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.css( "display", "none" );
+	$div.hide();
 	assert.equal( $div.innerHeight(), 70, "Test hidden div" );
 
 	// reset styles
@@ -195,6 +200,7 @@ 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 ) {
@@ -221,7 +227,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.css( "display", "none" );
+	$div.hide();
 	assert.equal( $div.outerWidth( true ), 94, "Test hidden div with padding, border and margin with margin option" );
 
 	// reset styles
@@ -233,6 +239,7 @@ 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 ) {
@@ -376,7 +383,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.css( "display", "none" );
+	$div.hide();
 	assert.equal( $div.outerHeight( true ), 94, "Test hidden div with padding, border and margin with margin option" );
 
 	// reset styles
@@ -388,6 +395,7 @@ 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 ) {
diff --git a/test/unit/queue.js b/test/unit/queue.js
index 0e36b01e7..7ce85cb35 100644
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -223,8 +223,6 @@ 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;
@@ -245,7 +243,6 @@ QUnit.asyncTest( "fn.promise( \"queue\" ) - waits for animation to complete befo
 	} );
 
 } );
-}
 
 QUnit.test( ".promise(obj)", function( assert ) {
 	assert.expect( 2 );
-- 
2.39.5