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
cc5e8e38
Commit
cc5e8e38
authored
Jan 13, 2012
by
Oleg
Committed by
Dave Methvin
Jan 13, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #10006: Allow .show() to work on detached elements.
parent
d07116a9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
1 deletion
+57
-1
effects.js
src/effects.js
+2
-1
effects.js
test/unit/effects.js
+54
-0
queue.js
test/unit/queue.js
+1
-0
No files found.
src/effects.js
View file @
cc5e8e38
...
@@ -38,7 +38,8 @@ jQuery.fn.extend({
...
@@ -38,7 +38,8 @@ jQuery.fn.extend({
// Set elements which have been overridden with display: none
// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// in a stylesheet to whatever the default browser style is
// for such an element
// for such an element
if
(
display
===
""
&&
jQuery
.
css
(
elem
,
"display"
)
===
"none"
)
{
if
(
(
display
===
""
&&
jQuery
.
css
(
elem
,
"display"
)
===
"none"
)
||
!
jQuery
.
contains
(
elem
.
ownerDocument
.
documentElement
,
elem
)
)
{
jQuery
.
_data
(
elem
,
"olddisplay"
,
defaultDisplay
(
elem
.
nodeName
)
);
jQuery
.
_data
(
elem
,
"olddisplay"
,
defaultDisplay
(
elem
.
nodeName
)
);
}
}
}
}
...
...
test/unit/effects.js
View file @
cc5e8e38
...
@@ -188,6 +188,60 @@ test("show() resolves correct default display #8099", function() {
...
@@ -188,6 +188,60 @@ test("show() resolves correct default display #8099", function() {
});
});
test
(
"show() resolves correct default display, detached nodes (#10006)"
,
function
(){
// Tests originally contributed by Orkel in
// https://github.com/jquery/jquery/pull/458
expect
(
11
);
var
div
,
span
;
div
=
jQuery
(
"<div class='hidden'>"
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
div
.
css
(
"display"
),
"block"
,
"Make sure a detached, pre-hidden( through stylesheets ) div is visible."
);
div
=
jQuery
(
"<div style='display: none'>"
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
div
.
css
(
"display"
),
"block"
,
"Make sure a detached, pre-hidden( through inline style ) div is visible."
);
span
=
jQuery
(
"<span class='hidden'/>"
);
span
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
span
.
css
(
"display"
),
"inline"
,
"Make sure a detached, pre-hidden( through stylesheets ) span has default display."
);
span
=
jQuery
(
"<span style='display: inline'/>"
);
span
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
span
.
css
(
"display"
),
"inline"
,
"Make sure a detached, pre-hidden( through inline style ) span has default display."
);
div
=
jQuery
(
"<div><div class='hidden'></div></div>"
).
children
(
"div"
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
div
.
css
(
"display"
),
"block"
,
"Make sure a detached, pre-hidden( through stylesheets ) div inside another visible div is visible."
);
div
=
jQuery
(
"<div><div style='display: none'></div></div>"
).
children
(
"div"
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
div
.
css
(
"display"
),
"block"
,
"Make sure a detached, pre-hidden( through inline style ) div inside another visible div is visible."
);
div
=
jQuery
(
"div.hidden"
);
div
.
detach
().
show
();
equal
(
div
.
css
(
"display"
),
"block"
,
"Make sure a detached( through detach() ), pre-hidden div is visible."
);
div
.
remove
();
span
=
jQuery
(
"<span>"
);
span
.
appendTo
(
"#qunit-fixture"
).
detach
().
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
span
.
css
(
"display"
),
"inline"
,
"Make sure a detached( through detach() ), pre-hidden span has default display."
);
span
.
remove
();
div
=
jQuery
(
"<div>"
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
ok
(
!!
div
.
get
(
0
).
style
.
display
,
"Make sure not hidden div has a inline style."
);
div
=
jQuery
(
document
.
createElement
(
"div"
)
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
div
.
css
(
"display"
),
"block"
,
"Make sure a pre-created element has default display."
);
div
=
jQuery
(
"<div style='display: inline'/>"
);
div
.
show
().
appendTo
(
"#qunit-fixture"
);
equal
(
div
.
css
(
"display"
),
"inline"
,
"Make sure that element has same display when it was created."
);
});
test
(
"animate(Hash, Object, Function)"
,
function
()
{
test
(
"animate(Hash, Object, Function)"
,
function
()
{
expect
(
1
);
expect
(
1
);
...
...
test/unit/queue.js
View file @
cc5e8e38
...
@@ -113,6 +113,7 @@ test("callbacks keep their place in the queue", function() {
...
@@ -113,6 +113,7 @@ test("callbacks keep their place in the queue", function() {
div
.
promise
(
"fx"
).
done
(
function
()
{
div
.
promise
(
"fx"
).
done
(
function
()
{
equal
(
counter
,
4
,
"Deferreds resolved"
);
equal
(
counter
,
4
,
"Deferreds resolved"
);
jQuery
.
removeData
(
div
[
0
],
"olddisplay"
,
true
);
start
();
start
();
});
});
});
});
...
...
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