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
efb98f85
Commit
efb98f85
authored
Dec 09, 2014
by
Nicolas HENRY
Committed by
Oleg Gaidarenko
Dec 25, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deferred: Fix $.when with resolved deferred and progress callbacks
Ref ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1
parent
62a333e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
deferred.js
src/deferred.js
+2
-2
deferred.js
test/unit/deferred.js
+22
-0
No files found.
src/deferred.js
View file @
efb98f85
...
@@ -133,9 +133,9 @@ jQuery.extend({
...
@@ -133,9 +133,9 @@ jQuery.extend({
for
(
;
i
<
length
;
i
++
)
{
for
(
;
i
<
length
;
i
++
)
{
if
(
resolveValues
[
i
]
&&
jQuery
.
isFunction
(
resolveValues
[
i
].
promise
)
)
{
if
(
resolveValues
[
i
]
&&
jQuery
.
isFunction
(
resolveValues
[
i
].
promise
)
)
{
resolveValues
[
i
].
promise
()
resolveValues
[
i
].
promise
()
.
progress
(
updateFunc
(
i
,
progressContexts
,
progressValues
)
)
.
done
(
updateFunc
(
i
,
resolveContexts
,
resolveValues
)
)
.
done
(
updateFunc
(
i
,
resolveContexts
,
resolveValues
)
)
.
fail
(
deferred
.
reject
)
.
fail
(
deferred
.
reject
);
.
progress
(
updateFunc
(
i
,
progressContexts
,
progressValues
)
);
}
else
{
}
else
{
--
remaining
;
--
remaining
;
}
}
...
...
test/unit/deferred.js
View file @
efb98f85
...
@@ -436,3 +436,25 @@ test( "jQuery.when - joined", function() {
...
@@ -436,3 +436,25 @@ test( "jQuery.when - joined", function() {
deferreds
.
futureSuccess
.
resolve
(
1
);
deferreds
.
futureSuccess
.
resolve
(
1
);
deferreds
.
futureError
.
reject
(
0
);
deferreds
.
futureError
.
reject
(
0
);
});
});
test
(
"jQuery.when - resolved"
,
function
()
{
expect
(
6
);
var
a
=
jQuery
.
Deferred
().
notify
(
1
).
resolve
(
4
),
b
=
jQuery
.
Deferred
().
notify
(
2
).
resolve
(
5
),
c
=
jQuery
.
Deferred
().
notify
(
3
).
resolve
(
6
);
jQuery
.
when
(
a
,
b
,
c
).
progress
(
function
(
a
,
b
,
c
)
{
strictEqual
(
a
,
1
,
"first notify value ok"
);
strictEqual
(
b
,
2
,
"second notify value ok"
);
strictEqual
(
c
,
3
,
"third notify value ok"
);
}).
done
(
function
(
a
,
b
,
c
)
{
strictEqual
(
a
,
4
,
"first resolve value ok"
);
strictEqual
(
b
,
5
,
"second resolve value ok"
);
strictEqual
(
c
,
6
,
"third resolve value ok"
);
}).
fail
(
function
()
{
ok
(
false
,
"Error on resolve"
);
});
});
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