Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
0d2e4796
Commit
0d2e4796
authored
Jan 31, 2011
by
rwldrn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #8099 - Always restore to correct display value based on element's expected default display
parent
e0b1bb8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
3 deletions
+39
-3
effects.js
src/effects.js
+24
-3
testsuite.css
test/data/testsuite.css
+3
-0
effects.js
test/unit/effects.js
+12
-0
No files found.
src/effects.js
View file @
0d2e4796
...
@@ -505,17 +505,38 @@ if ( jQuery.expr && jQuery.expr.filters ) {
...
@@ -505,17 +505,38 @@ if ( jQuery.expr && jQuery.expr.filters ) {
}
}
function
defaultDisplay
(
nodeName
)
{
function
defaultDisplay
(
nodeName
)
{
var
stylesheets
=
document
.
styleSheets
,
disabled
=
[],
elem
,
display
;
if
(
!
elemdisplay
[
nodeName
]
)
{
if
(
!
elemdisplay
[
nodeName
]
)
{
var
elem
=
jQuery
(
"<"
+
nodeName
+
">"
).
appendTo
(
"body"
),
display
=
elem
.
css
(
"display"
);
// #8099 - If the end-dev has globally changed a default
// display, we can temporarily disable their styles to check
// for the correct default value
jQuery
.
each
(
stylesheets
,
function
(
idx
,
obj
)
{
disabled
[
idx
]
=
obj
.
disabled
;
obj
.
disabled
=
true
;
});
// Create a temp element and check it's default display
elem
=
jQuery
(
"<"
+
nodeName
+
">"
).
appendTo
(
"body"
),
display
=
elem
.
css
(
"display"
);
// Remove temp element
elem
.
remove
();
elem
.
remove
();
if
(
display
===
"none"
||
display
===
""
)
{
if
(
display
===
"none"
||
display
===
""
)
{
display
=
"block"
;
display
=
"block"
;
}
}
// Store the correct default display
elemdisplay
[
nodeName
]
=
display
;
elemdisplay
[
nodeName
]
=
display
;
// Restore stylesheets
jQuery
.
each
(
stylesheets
,
function
(
idx
,
obj
)
{
this
.
disabled
=
disabled
[
idx
];
});
}
}
return
elemdisplay
[
nodeName
];
return
elemdisplay
[
nodeName
];
...
...
test/data/testsuite.css
View file @
0d2e4796
...
@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
...
@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
#nothiddendiv
{
font-size
:
16px
;
}
#nothiddendiv
{
font-size
:
16px
;
}
#nothiddendivchild
.em
{
font-size
:
2em
;
}
#nothiddendivchild
.em
{
font-size
:
2em
;
}
#nothiddendivchild
.prct
{
font-size
:
150%
;
}
#nothiddendivchild
.prct
{
font-size
:
150%
;
}
/* 8099 changes to default styles are read correctly */
tt
{
display
:
none
;
}
test/unit/effects.js
View file @
0d2e4796
...
@@ -169,6 +169,18 @@ test("Persist correct display value", function() {
...
@@ -169,6 +169,18 @@ test("Persist correct display value", function() {
});
});
});
});
test
(
"show() resolves correct default display #8099"
,
function
()
{
expect
(
3
);
var
bug8099
=
jQuery
(
"<tt/>"
).
appendTo
(
"#main"
);
equals
(
bug8099
.
css
(
"display"
),
"none"
,
"default display override for all tt"
);
equals
(
bug8099
.
show
().
css
(
"display"
),
"inline"
,
"Correctly resolves display:inline"
);
bug8099
.
remove
();
equals
(
jQuery
(
"#foo"
).
hide
().
show
().
css
(
"display"
),
"block"
,
"Correctly resolves display:block after hide/show"
);
});
test
(
"animate(Hash, Object, Function)"
,
function
()
{
test
(
"animate(Hash, Object, Function)"
,
function
()
{
expect
(
1
);
expect
(
1
);
stop
();
stop
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment