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
c5fda294
Commit
c5fda294
authored
May 11, 2012
by
Dave Methvin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #11736. Remove deprecated Deferred.isResolved/isRejected.
parent
fe88534b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
6 deletions
+1
-6
deferred.js
src/deferred.js
+0
-3
deferred.js
test/unit/deferred.js
+1
-3
No files found.
src/deferred.js
View file @
c5fda294
...
@@ -73,9 +73,6 @@ jQuery.extend({
...
@@ -73,9 +73,6 @@ jQuery.extend({
// [ reject_list | resolve_list ].disable; progress_list.lock
// [ reject_list | resolve_list ].disable; progress_list.lock
},
tuples
[
i
^
1
][
2
].
disable
,
tuples
[
2
][
2
].
lock
);
},
tuples
[
i
^
1
][
2
].
disable
,
tuples
[
2
][
2
].
lock
);
// <DEPRECATED> [ isResolved | isRejected ] = [ resolve_list | reject_list ].fired
promise
[
"isR"
+
stateString
.
substr
(
1
)
]
=
list
.
fired
;
}
}
// deferred[ resolve | reject | notify ] = list.fire
// deferred[ resolve | reject | notify ] = list.fire
...
...
test/unit/deferred.js
View file @
c5fda294
...
@@ -8,7 +8,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
...
@@ -8,7 +8,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
test
(
"jQuery.Deferred"
+
withNew
,
function
()
{
test
(
"jQuery.Deferred"
+
withNew
,
function
()
{
expect
(
2
3
);
expect
(
2
1
);
var
defer
=
createDeferred
();
var
defer
=
createDeferred
();
...
@@ -16,7 +16,6 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
...
@@ -16,7 +16,6 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
createDeferred
().
resolve
().
done
(
function
()
{
createDeferred
().
resolve
().
done
(
function
()
{
ok
(
true
,
"Success on resolve"
);
ok
(
true
,
"Success on resolve"
);
ok
(
this
.
isResolved
(),
"Deferred is resolved"
);
strictEqual
(
this
.
state
(),
"resolved"
,
"Deferred is resolved (state)"
);
strictEqual
(
this
.
state
(),
"resolved"
,
"Deferred is resolved (state)"
);
}).
fail
(
function
()
{
}).
fail
(
function
()
{
ok
(
false
,
"Error on resolve"
);
ok
(
false
,
"Error on resolve"
);
...
@@ -28,7 +27,6 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
...
@@ -28,7 +27,6 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
ok
(
false
,
"Success on reject"
);
ok
(
false
,
"Success on reject"
);
}).
fail
(
function
()
{
}).
fail
(
function
()
{
ok
(
true
,
"Error on reject"
);
ok
(
true
,
"Error on reject"
);
ok
(
this
.
isRejected
(),
"Deferred is rejected"
);
strictEqual
(
this
.
state
(),
"rejected"
,
"Deferred is rejected (state)"
);
strictEqual
(
this
.
state
(),
"rejected"
,
"Deferred is rejected (state)"
);
}).
always
(
function
()
{
}).
always
(
function
()
{
ok
(
true
,
"Always callback on reject"
);
ok
(
true
,
"Always callback on reject"
);
...
...
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