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 all commits
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
64 changes: 2 additions & 62 deletions src/css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ define([
"./css/var/getStyles",
"./css/curCSS",
"./css/adjustCSS",
"./css/defaultDisplay",
"./css/addGetHookIf",
"./css/support",
"./data/var/dataPriv",
"./css/showHide",
Copy link
Member

@dmethvin dmethvin Apr 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we pull .show() and .hide() into this file and remove the dependency inside css.js completely? That way it becomes a separate module and can be removed in a custom build if you use classes for showing and hiding.

Copy link
Member Author

@gibson042 gibson042 Apr 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, introduce a new showHide module (.show, .hide, and .toggle) depending on data and depended upon by effects? That sounds reasonable, but out of scope for this ticket.

Copy link
Member

@dmethvin dmethvin Apr 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it can go in a different ticket and pull request, I'll create an issue. Now that showHide is broken out it seems pretty clear we could do that, and in fact the new module only helps with size reductions if it can be excluded. As it is right now, it can't ever be excluded because of the dependency here.


"./core/init",
"./css/swap",
"./core/ready",
"./selector" // contains
], function( jQuery, pnum, access, rmargin, rcssNum, rnumnonpx, cssExpand, isHidden,
getStyles, curCSS, adjustCSS, defaultDisplay, addGetHookIf, support, dataPriv ) {
getStyles, curCSS, adjustCSS, addGetHookIf, support, showHide ) {

var
// Swappable if display is none or starts with table
Expand Down Expand Up @@ -151,65 +150,6 @@ function getWidthOrHeight( elem, name, extra ) {
) + "px";
}

function showHide( elements, show ) {
var display, elem, hidden,
values = [],
index = 0,
length = elements.length;

for ( ; index < length; index++ ) {
elem = elements[ index ];
if ( !elem.style ) {
continue;
}

values[ index ] = dataPriv.get( elem, "olddisplay" );
display = elem.style.display;
if ( show ) {
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
if ( !values[ index ] && display === "none" ) {
elem.style.display = "";
}

// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// for such an element
if ( elem.style.display === "" && isHidden( elem ) ) {
values[ index ] = dataPriv.access(
elem,
"olddisplay",
defaultDisplay(elem.nodeName)
);
}
} else {
hidden = isHidden( elem );

if ( display !== "none" || !hidden ) {
dataPriv.set(
elem,
"olddisplay",
hidden ? display : jQuery.css( elem, "display" )
);
}
}
}

// Set the display of most of the elements in a second loop
// to avoid the constant reflow
for ( index = 0; index < length; index++ ) {
elem = elements[ index ];
if ( !elem.style ) {
continue;
}
if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
elem.style.display = show ? values[ index ] || "" : "none";
}
}

return elements;
}

jQuery.extend({

// Add in style property hooks for overriding the default
Expand Down
71 changes: 0 additions & 71 deletions src/css/defaultDisplay.js
View file
Open in desktop

This file was deleted.

47 changes: 47 additions & 0 deletions src/css/showHide.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
define([
"../data/var/dataPriv"
], function( dataPriv ) {

function showHide( elements, show ) {
var display, elem,
values = [],
index = 0,
length = elements.length;

// Determine new display value for elements that need to change
for ( ; index < length; index++ ) {
elem = elements[ index ];
if ( !elem.style ) {
continue;
}

display = elem.style.display;
if ( show ) {
if ( display === "none" ) {
// Restore a pre-hide() value if we have one
values[ index ] = dataPriv.get( elem, "display" ) || "";
}
} else {
if ( display !== "none" ) {
values[ index ] = "none";

// Remember the value we're replacing
dataPriv.set( elem, "display", display );
}
}
}

// Set the display of the elements in a second loop
// to avoid the constant reflow
for ( index = 0; index < length; index++ ) {
if ( values[ index ] != null ) {
elements[ index ].style.display = values[ index ];
}
}

return elements;
}

return showHide;

});
Loading