Skip to content

CSS: Ignore the CSS cascade in show()/hide()/etc. #2180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gibson042 wants to merge 12 commits into from
Closed

CSS: Ignore the CSS cascade in show()/hide()/etc. #2180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dde0aa8
Effects: Improve comments
gibson042 Apr 2, 2015
38f8819
CSS: Ignore the CSS cascade in show()/hide()/etc.
gibson042 Mar 30, 2015
f64a6b6
Tests: Replace CSS & Effects #show-tests with inline display: none
gibson042 Mar 30, 2015
be3cda1
Tests: Generalize effects assertions from elem.style to jQuery.css
gibson042 Mar 30, 2015
e8c6f33
Tests: Avoid using getComputedStyle on disconnected elements
gibson042 Apr 4, 2015
6e6eeb6
Tests: Convert an effects test to fake asynchronicitiy
gibson042 Apr 3, 2015
dacb47e
Effects: Reset display to inline before finishing a hide animation
gibson042 Apr 2, 2015
7b8b177
Tests: Remove "Animation ends immediately when document.hidden"
gibson042 Apr 5, 2015
867b24b
Effects: Abandon defaultDisplay
gibson042 Apr 5, 2015
f5fdbd0
Effects: Reduce size
gibson042 Apr 6, 2015
bda5c2b
Effects: Reference other tickets
gibson042 Apr 6, 2015
65d3d4a
CSS: Rename private data key "olddisplay" for smaller size
gibson042 Apr 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tests: Replace CSS & Effects #show-tests with inline display: none
  • Loading branch information
@gibson042
gibson042 committed Apr 6, 2015
commit f64a6b69851ea0900dba9b919f94c6765f28b5b5
13 changes: 9 additions & 4 deletions test/unit/css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,8 +490,8 @@ test("show();", function() {

expect( 18 );

var hiddendiv, div, pass, old, test;
hiddendiv = jQuery("div.hidden");
var hiddendiv, div, pass, old, test;
hiddendiv = jQuery("div.hidden");

equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");

Expand All @@ -512,8 +512,13 @@ test("show();", function() {
});
ok( pass, "Show" );

// #show-tests * is set display: none in CSS
jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
jQuery(
"<div id='show-tests'>" +
"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
"<ul><li></li></ul></div>" +
"<table id='test-table'></table>"
).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );

old = jQuery("#test-table").show().css("display") !== "table";
jQuery("#test-table").remove();
Expand Down
36 changes: 19 additions & 17 deletions test/unit/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,13 @@ test("sanity check", function() {
equal( jQuery("#dl:visible, #qunit-fixture:visible, #foo:visible").length, 2, "QUnit state is correct for testing effects" );
});

test("show() basic", 2, function() {
var div,
hiddendiv = jQuery("div.hidden");

hiddendiv.hide().show();

equal( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );

div = jQuery("<div>").hide().appendTo("#qunit-fixture").show();
test("show() basic", 1, function() {
var div = jQuery("<div>").hide().appendTo("#qunit-fixture").show();

equal( div.css("display"), "block", "Make sure pre-hidden divs show" );

// Clean up the detached node
div.remove();

QUnit.expectJqData( this, hiddendiv, "olddisplay" );
});

test("show()", 27, function () {
Expand Down Expand Up @@ -94,8 +85,13 @@ test("show()", 27, function () {
// Tolerate data from show()/hide()
QUnit.expectJqData( this, div, "olddisplay" );

// #show-tests * is set display: none in CSS
jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
jQuery(
"<div id='show-tests'>" +
"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
"<ul><li></li></ul></div>" +
"<table id='test-table'></table>"
).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );

old = jQuery("#test-table").show().css("display") !== "table";
jQuery("#test-table").remove();
Expand Down Expand Up @@ -132,11 +128,17 @@ test("show()", 27, function () {
test("show(Number) - other displays", function() {
expect(15);

// #show-tests * is set display: none in CSS
jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
jQuery(
"<div id='show-tests'>" +
"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
"<ul><li></li></ul></div>" +
"<table id='test-table'></table>"
).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );

var test,
old = jQuery("#test-table").show().css("display") !== "table";

jQuery("#test-table").remove();

// Note: inline elements are expected to be inline-block
Expand Down Expand Up @@ -174,8 +176,8 @@ test("show(Number) - other displays", function() {
test("Persist correct display value", function() {
expect(3);

// #show-tests * is set display: none in CSS
jQuery("#qunit-fixture").append("<div id='show-tests'><span style='position:absolute;'>foo</span></div>");
jQuery( "<div id='show-tests'><span style='position:absolute;'>foo</span></div>" )
.appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );

var $span = jQuery("#show-tests span"),
displayNone = $span.css("display"),
Expand Down