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
3586ea28
Commit
3586ea28
authored
Nov 22, 2011
by
Dave Methvin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Landing pull request 581. Updates original patch by Orkel. Fixes #10006."
This reverts commit
299bc655
.
parent
ca08d93b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
65 deletions
+2
-65
effects.js
src/effects.js
+1
-2
effects.js
test/unit/effects.js
+1
-63
No files found.
src/effects.js
View file @
3586ea28
...
@@ -38,8 +38,7 @@ jQuery.fn.extend({
...
@@ -38,8 +38,7 @@ 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 @
3586ea28
...
@@ -167,7 +167,7 @@ test("Persist correct display value", function() {
...
@@ -167,7 +167,7 @@ test("Persist correct display value", function() {
});
});
});
});
test
(
"show() resolves correct default display
(#8099)
"
,
function
()
{
test
(
"show() resolves correct default display
#8099
"
,
function
()
{
expect
(
7
);
expect
(
7
);
var
tt8099
=
jQuery
(
"<tt/>"
).
appendTo
(
"body"
),
var
tt8099
=
jQuery
(
"<tt/>"
).
appendTo
(
"body"
),
dfn8099
=
jQuery
(
"<dfn/>"
,
{
html
:
"foo"
}).
appendTo
(
"body"
);
dfn8099
=
jQuery
(
"<dfn/>"
,
{
html
:
"foo"
}).
appendTo
(
"body"
);
...
@@ -185,69 +185,7 @@ test("show() resolves correct default display (#8099)", function() {
...
@@ -185,69 +185,7 @@ test("show() resolves correct default display (#8099)", function() {
tt8099
.
remove
();
tt8099
.
remove
();
dfn8099
.
remove
();
dfn8099
.
remove
();
});
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
.
remove
();
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."
);
div
.
remove
();
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
.
remove
();
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."
);
span
.
remove
();
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
.
remove
();
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
.
remove
();
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
.
remove
();
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
.
remove
();
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."
);
div
.
remove
();
});
});
...
...
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