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
09b28534
Commit
09b28534
authored
Dec 24, 2013
by
Dave Methvin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Effects: First step() call should match :animated selector
(cherry picked from commit
08581447
) Fixes #14623 Closes gh-1473
parent
ab1224dd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
effects.js
src/effects.js
+4
-1
effects.js
test/unit/effects.js
+15
-0
No files found.
src/effects.js
View file @
09b28534
...
@@ -616,8 +616,11 @@ jQuery.fx.tick = function() {
...
@@ -616,8 +616,11 @@ jQuery.fx.tick = function() {
};
};
jQuery
.
fx
.
timer
=
function
(
timer
)
{
jQuery
.
fx
.
timer
=
function
(
timer
)
{
if
(
timer
()
&&
jQuery
.
timers
.
push
(
timer
)
)
{
jQuery
.
timers
.
push
(
timer
);
if
(
timer
()
)
{
jQuery
.
fx
.
start
();
jQuery
.
fx
.
start
();
}
else
{
jQuery
.
timers
.
pop
();
}
}
};
};
...
...
test/unit/effects.js
View file @
09b28534
...
@@ -1608,6 +1608,21 @@ test("Animation callback should not show animated element as :animated (#7157)",
...
@@ -1608,6 +1608,21 @@ test("Animation callback should not show animated element as :animated (#7157)",
this
.
clock
.
tick
(
100
);
this
.
clock
.
tick
(
100
);
});
});
test
(
"Initial step callback should show element as :animated (#14623)"
,
1
,
function
()
{
var
foo
=
jQuery
(
"#foo"
);
foo
.
animate
({
opacity
:
0
},
{
duration
:
100
,
step
:
function
()
{
ok
(
foo
.
is
(
":animated"
),
"The element matches :animated inside step function"
);
}
});
this
.
clock
.
tick
(
1
);
foo
.
stop
();
});
test
(
"hide called on element within hidden parent should set display to none (#10045)"
,
3
,
function
()
{
test
(
"hide called on element within hidden parent should set display to none (#10045)"
,
3
,
function
()
{
var
hidden
=
jQuery
(
".hidden"
),
var
hidden
=
jQuery
(
".hidden"
),
elems
=
jQuery
(
"<div>hide</div><div>hide0</div><div>hide1</div>"
);
elems
=
jQuery
(
"<div>hide</div><div>hide0</div><div>hide1</div>"
);
...
...
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