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
59240d31
Commit
59240d31
authored
Apr 13, 2011
by
rwldrn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ticket #8099 Updates per review
parent
4fde550c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
effects.js
src/effects.js
+3
-10
effects.js
test/unit/effects.js
+7
-2
No files found.
src/effects.js
View file @
59240d31
(
function
(
jQuery
)
{
(
function
(
jQuery
)
{
var
elemdisplay
=
{},
var
elemdisplay
=
{},
iframe
=
null
,
iframeDoc
=
null
,
rfxtypes
=
/^
(?:
toggle|show|hide
)
$/
,
rfxtypes
=
/^
(?:
toggle|show|hide
)
$/
,
rfxnum
=
/^
([
+
\-]
=
)?([\d
+.
\-]
+
)([
a-z%
]
*
)
$/i
,
rfxnum
=
/^
([
+
\-]
=
)?([\d
+.
\-]
+
)([
a-z%
]
*
)
$/i
,
timerId
,
timerId
,
...
@@ -558,11 +560,8 @@ function defaultDisplay( nodeName ) {
...
@@ -558,11 +560,8 @@ function defaultDisplay( nodeName ) {
if
(
display
===
"none"
||
display
===
""
)
{
if
(
display
===
"none"
||
display
===
""
)
{
var
iframe
=
defaultDisplay
.
iframe
,
iframeDoc
=
defaultDisplay
.
iframeDoc
;
// No iframe to use yet, so create it
// No iframe to use yet, so create it
if
(
!
defaultDisplay
.
iframe
)
{
if
(
!
iframe
)
{
iframe
=
document
.
createElement
(
"iframe"
);
iframe
=
document
.
createElement
(
"iframe"
);
iframe
.
width
=
iframe
.
height
=
0
;
iframe
.
width
=
iframe
.
height
=
0
;
...
@@ -572,9 +571,6 @@ function defaultDisplay( nodeName ) {
...
@@ -572,9 +571,6 @@ function defaultDisplay( nodeName ) {
iframeDoc
=
(
iframe
.
contentWindow
||
iframe
.
contentDocument
).
document
;
iframeDoc
=
(
iframe
.
contentWindow
||
iframe
.
contentDocument
).
document
;
iframeDoc
.
write
(
"<!doctype><html><body></body></html>"
);
iframeDoc
.
write
(
"<!doctype><html><body></body></html>"
);
// Cache iframe element
defaultDisplay
.
iframe
=
iframe
;
defaultDisplay
.
iframeDoc
=
iframeDoc
;
}
else
{
}
else
{
// Reuse previous iframe
// Reuse previous iframe
...
@@ -598,9 +594,6 @@ function defaultDisplay( nodeName ) {
...
@@ -598,9 +594,6 @@ function defaultDisplay( nodeName ) {
return
elemdisplay
[
nodeName
];
return
elemdisplay
[
nodeName
];
}
}
defaultDisplay
.
iframe
=
null
;
defaultDisplay
.
iframeDoc
=
null
;
})(
jQuery
);
})(
jQuery
);
test/unit/effects.js
View file @
59240d31
...
@@ -163,8 +163,9 @@ test("Persist correct display value", function() {
...
@@ -163,8 +163,9 @@ test("Persist correct display value", function() {
});
});
test
(
"show() resolves correct default display #8099"
,
function
()
{
test
(
"show() resolves correct default display #8099"
,
function
()
{
expect
(
5
);
expect
(
7
);
var
bug8099
=
jQuery
(
"<tt/>"
).
appendTo
(
"#main"
);
var
bug8099
=
jQuery
(
"<tt/>"
).
appendTo
(
"#main"
),
div8099
=
jQuery
(
"<div/>"
,
{
className
:
"hidden"
}).
appendTo
(
"#main"
);
equals
(
bug8099
.
css
(
"display"
),
"none"
,
"default display override for all tt"
);
equals
(
bug8099
.
css
(
"display"
),
"none"
,
"default display override for all tt"
);
equals
(
bug8099
.
show
().
css
(
"display"
),
"inline"
,
"Correctly resolves display:inline"
);
equals
(
bug8099
.
show
().
css
(
"display"
),
"inline"
,
"Correctly resolves display:inline"
);
...
@@ -174,7 +175,11 @@ test("show() resolves correct default display #8099", function() {
...
@@ -174,7 +175,11 @@ test("show() resolves correct default display #8099", function() {
equals
(
bug8099
.
hide
().
css
(
"display"
),
"none"
,
"default display override for all tt"
);
equals
(
bug8099
.
hide
().
css
(
"display"
),
"none"
,
"default display override for all tt"
);
equals
(
bug8099
.
show
().
css
(
"display"
),
"inline"
,
"Correctly resolves display:inline"
);
equals
(
bug8099
.
show
().
css
(
"display"
),
"inline"
,
"Correctly resolves display:inline"
);
equals
(
div8099
.
show
().
css
(
"display"
),
"block"
,
"default display override for all div.hidden"
);
equals
(
div8099
.
hide
().
css
(
"display"
),
"none"
,
"Correctly resolves display:none"
);
bug8099
.
remove
();
bug8099
.
remove
();
div8099
.
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