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
52afe208
Commit
52afe208
authored
Nov 01, 2011
by
timmywil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a failing effects test in IE; minor style changes in effects
parent
006fde22
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
16 deletions
+21
-16
css.js
src/css.js
+5
-3
effects.js
src/effects.js
+16
-13
No files found.
src/css.js
View file @
52afe208
...
@@ -285,12 +285,14 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
...
@@ -285,12 +285,14 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
if
(
document
.
documentElement
.
currentStyle
)
{
if
(
document
.
documentElement
.
currentStyle
)
{
currentStyle
=
function
(
elem
,
name
)
{
currentStyle
=
function
(
elem
,
name
)
{
var
left
,
rsLeft
,
var
left
,
rsLeft
,
uncomputed
,
ret
=
elem
.
currentStyle
&&
elem
.
currentStyle
[
name
],
ret
=
elem
.
currentStyle
&&
elem
.
currentStyle
[
name
],
style
=
elem
.
style
;
style
=
elem
.
style
;
if
(
ret
===
null
&&
style
)
{
// Avoid setting ret to empty string here
ret
=
style
[
name
];
// so we don't default to auto
if
(
ret
===
null
&&
style
&&
(
uncomputed
=
style
[
name
])
)
{
ret
=
uncomputed
;
}
}
// From the awesome hack by Dean Edwards
// From the awesome hack by Dean Edwards
...
...
src/effects.js
View file @
52afe208
...
@@ -20,11 +20,11 @@ jQuery.fn.extend({
...
@@ -20,11 +20,11 @@ jQuery.fn.extend({
var
elem
,
display
;
var
elem
,
display
;
if
(
speed
||
speed
===
0
)
{
if
(
speed
||
speed
===
0
)
{
return
this
.
animate
(
genFx
(
"show"
,
3
),
speed
,
easing
,
callback
);
return
this
.
animate
(
genFx
(
"show"
,
3
),
speed
,
easing
,
callback
);
}
else
{
}
else
{
for
(
var
i
=
0
,
j
=
this
.
length
;
i
<
j
;
i
++
)
{
for
(
var
i
=
0
,
j
=
this
.
length
;
i
<
j
;
i
++
)
{
elem
=
this
[
i
];
elem
=
this
[
i
];
if
(
elem
.
style
)
{
if
(
elem
.
style
)
{
display
=
elem
.
style
.
display
;
display
=
elem
.
style
.
display
;
...
@@ -38,8 +38,8 @@ jQuery.fn.extend({
...
@@ -38,8 +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
.
_data
(
elem
,
"olddisplay"
,
defaultDisplay
(
elem
.
nodeName
)
);
jQuery
.
_data
(
elem
,
"olddisplay"
,
defaultDisplay
(
elem
.
nodeName
)
);
}
}
}
}
}
}
...
@@ -47,13 +47,13 @@ jQuery.fn.extend({
...
@@ -47,13 +47,13 @@ jQuery.fn.extend({
// Set the display of most of the elements in a second loop
// Set the display of most of the elements in a second loop
// to avoid the constant reflow
// to avoid the constant reflow
for
(
i
=
0
;
i
<
j
;
i
++
)
{
for
(
i
=
0
;
i
<
j
;
i
++
)
{
elem
=
this
[
i
];
elem
=
this
[
i
];
if
(
elem
.
style
)
{
if
(
elem
.
style
)
{
display
=
elem
.
style
.
display
;
display
=
elem
.
style
.
display
;
if
(
display
===
""
||
display
===
"none"
)
{
if
(
display
===
""
||
display
===
"none"
)
{
elem
.
style
.
display
=
jQuery
.
_data
(
elem
,
"olddisplay"
)
||
""
;
elem
.
style
.
display
=
jQuery
.
_data
(
elem
,
"olddisplay"
)
||
""
;
}
}
}
}
}
}
...
@@ -67,12 +67,17 @@ jQuery.fn.extend({
...
@@ -67,12 +67,17 @@ jQuery.fn.extend({
return
this
.
animate
(
genFx
(
"hide"
,
3
),
speed
,
easing
,
callback
);
return
this
.
animate
(
genFx
(
"hide"
,
3
),
speed
,
easing
,
callback
);
}
else
{
}
else
{
for
(
var
i
=
0
,
j
=
this
.
length
;
i
<
j
;
i
++
)
{
var
elem
,
display
,
i
f
(
this
[
i
].
style
)
{
i
=
0
,
var
display
=
jQuery
.
css
(
this
[
i
],
"display"
)
;
j
=
this
.
length
;
if
(
display
!==
"none"
&&
!
jQuery
.
_data
(
this
[
i
],
"olddisplay"
)
)
{
for
(
;
i
<
j
;
i
++
)
{
jQuery
.
_data
(
this
[
i
],
"olddisplay"
,
display
);
elem
=
this
[
i
];
if
(
elem
.
style
)
{
display
=
jQuery
.
css
(
elem
,
"display"
);
if
(
display
!==
"none"
&&
!
jQuery
.
_data
(
elem
,
"olddisplay"
)
)
{
jQuery
.
_data
(
elem
,
"olddisplay"
,
display
);
}
}
}
}
}
}
...
@@ -635,7 +640,6 @@ function defaultDisplay( nodeName ) {
...
@@ -635,7 +640,6 @@ function defaultDisplay( nodeName ) {
var
body
=
document
.
body
,
var
body
=
document
.
body
,
elem
=
jQuery
(
"<"
+
nodeName
+
">"
).
appendTo
(
body
),
elem
=
jQuery
(
"<"
+
nodeName
+
">"
).
appendTo
(
body
),
display
=
elem
.
css
(
"display"
);
display
=
elem
.
css
(
"display"
);
elem
.
remove
();
elem
.
remove
();
// If the simple way fails,
// If the simple way fails,
...
@@ -663,7 +667,6 @@ function defaultDisplay( nodeName ) {
...
@@ -663,7 +667,6 @@ function defaultDisplay( nodeName ) {
iframeDoc
.
body
.
appendChild
(
elem
);
iframeDoc
.
body
.
appendChild
(
elem
);
display
=
jQuery
.
css
(
elem
,
"display"
);
display
=
jQuery
.
css
(
elem
,
"display"
);
body
.
removeChild
(
iframe
);
body
.
removeChild
(
iframe
);
}
}
...
...
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