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
2d4001b8
Commit
2d4001b8
authored
Dec 24, 2010
by
unknown
Committed by
jaubourg
Dec 31, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Capitalized Deferred & _Deferred to clearly mark them as new types, like Event.
parent
22e28b01
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
28 deletions
+28
-28
core.js
src/core.js
+6
-6
xhr.js
src/xhr.js
+2
-2
core.js
test/unit/core.js
+20
-20
No files found.
src/core.js
View file @
2d4001b8
...
@@ -805,7 +805,7 @@ jQuery.extend({
...
@@ -805,7 +805,7 @@ jQuery.extend({
},
},
// Create a simple deferred (one callbacks list)
// Create a simple deferred (one callbacks list)
_
d
eferred
:
function
(
cancellable
)
{
_
D
eferred
:
function
(
cancellable
)
{
// cancellable by default
// cancellable by default
cancellable
=
cancellable
!==
false
;
cancellable
=
cancellable
!==
false
;
...
@@ -901,7 +901,7 @@ jQuery.extend({
...
@@ -901,7 +901,7 @@ jQuery.extend({
// Full fledged deferred (two callbacks list)
// Full fledged deferred (two callbacks list)
// Typical success/error system
// Typical success/error system
d
eferred
:
function
(
func
,
cancellable
)
{
D
eferred
:
function
(
func
,
cancellable
)
{
// Handle varargs
// Handle varargs
if
(
arguments
.
length
===
1
)
{
if
(
arguments
.
length
===
1
)
{
...
@@ -912,8 +912,8 @@ jQuery.extend({
...
@@ -912,8 +912,8 @@ jQuery.extend({
}
}
}
}
var
errorDeferred
=
jQuery
.
_
d
eferred
(
cancellable
),
var
errorDeferred
=
jQuery
.
_
D
eferred
(
cancellable
),
deferred
=
jQuery
.
_
d
eferred
(
cancellable
),
deferred
=
jQuery
.
_
D
eferred
(
cancellable
),
// Keep reference of the cancel method since we'll redefine it
// Keep reference of the cancel method since we'll redefine it
cancelThen
=
deferred
.
cancel
;
cancelThen
=
deferred
.
cancel
;
...
@@ -953,7 +953,7 @@ jQuery.extend({
...
@@ -953,7 +953,7 @@ jQuery.extend({
method
=
method
||
"then"
;
method
=
method
||
"then"
;
object
=
jQuery
.
isDeferred
(
object
,
method
)
?
object
=
jQuery
.
isDeferred
(
object
,
method
)
?
object
:
object
:
jQuery
.
d
eferred
().
resolve
(
object
);
jQuery
.
D
eferred
().
resolve
(
object
);
object
.
fail
=
object
.
fail
||
function
()
{
return
this
;
};
object
.
fail
=
object
.
fail
||
function
()
{
return
this
;
};
object
[
method
]
=
object
[
method
]
||
object
.
then
;
object
[
method
]
=
object
[
method
]
||
object
.
then
;
object
.
then
=
object
.
then
||
object
[
method
];
object
.
then
=
object
.
then
||
object
[
method
];
...
@@ -979,7 +979,7 @@ jQuery.extend({
...
@@ -979,7 +979,7 @@ jQuery.extend({
// Create readyList deferred
// Create readyList deferred
// also force $.fn.ready to be recognized as a defer
// also force $.fn.ready to be recognized as a defer
readyList
=
jQuery
.
_
d
eferred
(
false
);
readyList
=
jQuery
.
_
D
eferred
(
false
);
jQuery
.
fn
.
ready
.
_
=
deferredMarker
;
jQuery
.
fn
.
ready
.
_
=
deferredMarker
;
// Populate the class2type map
// Populate the class2type map
...
...
src/xhr.js
View file @
2d4001b8
...
@@ -23,8 +23,8 @@ jQuery.xhr = function( _native ) {
...
@@ -23,8 +23,8 @@ jQuery.xhr = function( _native ) {
if
(
force
||
internal
)
{
if
(
force
||
internal
)
{
// Reset callbacks lists
// Reset callbacks lists
deferred
=
jQuery
.
d
eferred
();
deferred
=
jQuery
.
D
eferred
();
completeDeferred
=
jQuery
.
_
d
eferred
();
completeDeferred
=
jQuery
.
_
D
eferred
();
xhr
.
success
=
xhr
.
then
=
deferred
.
then
;
xhr
.
success
=
xhr
.
then
=
deferred
.
then
;
xhr
.
error
=
xhr
.
fail
=
deferred
.
fail
;
xhr
.
error
=
xhr
.
fail
=
deferred
.
fail
;
...
...
test/unit/core.js
View file @
2d4001b8
...
@@ -905,7 +905,7 @@ test("jQuery.parseJSON", function(){
...
@@ -905,7 +905,7 @@ test("jQuery.parseJSON", function(){
}
}
});
});
test
(
"jQuery._
d
eferred()"
,
function
()
{
test
(
"jQuery._
D
eferred()"
,
function
()
{
expect
(
14
);
expect
(
14
);
...
@@ -913,7 +913,7 @@ test("jQuery._deferred()", function() {
...
@@ -913,7 +913,7 @@ test("jQuery._deferred()", function() {
object
,
object
,
test
;
test
;
deferred
=
jQuery
.
_
d
eferred
();
deferred
=
jQuery
.
_
D
eferred
();
test
=
false
;
test
=
false
;
...
@@ -946,7 +946,7 @@ test("jQuery._deferred()", function() {
...
@@ -946,7 +946,7 @@ test("jQuery._deferred()", function() {
ok
(
test
,
"Test manual cancel"
);
ok
(
test
,
"Test manual cancel"
);
deferred
=
jQuery
.
_
d
eferred
().
then
(
function
()
{
deferred
=
jQuery
.
_
D
eferred
().
then
(
function
()
{
return
false
;
return
false
;
}
);
}
);
...
@@ -961,7 +961,7 @@ test("jQuery._deferred()", function() {
...
@@ -961,7 +961,7 @@ test("jQuery._deferred()", function() {
ok
(
test
,
"Test cancel by returning false"
);
ok
(
test
,
"Test cancel by returning false"
);
try
{
try
{
deferred
=
jQuery
.
_
d
eferred
().
resolve
().
then
(
function
()
{
deferred
=
jQuery
.
_
D
eferred
().
resolve
().
then
(
function
()
{
throw
"Error"
;
throw
"Error"
;
}
,
function
()
{
}
,
function
()
{
ok
(
false
,
"Test deferred cancel on exception"
);
ok
(
false
,
"Test deferred cancel on exception"
);
...
@@ -972,7 +972,7 @@ test("jQuery._deferred()", function() {
...
@@ -972,7 +972,7 @@ test("jQuery._deferred()", function() {
}
}
test
=
""
;
test
=
""
;
deferred
=
jQuery
.
_
d
eferred
().
then
(
function
()
{
deferred
=
jQuery
.
_
D
eferred
().
then
(
function
()
{
test
+=
"A"
;
test
+=
"A"
;
...
@@ -1003,7 +1003,7 @@ test("jQuery._deferred()", function() {
...
@@ -1003,7 +1003,7 @@ test("jQuery._deferred()", function() {
strictEqual
(
test
,
"ABC"
,
"Test then callbacks order"
);
strictEqual
(
test
,
"ABC"
,
"Test then callbacks order"
);
deferred
=
jQuery
.
_
d
eferred
(
false
).
resolve
().
cancel
();
deferred
=
jQuery
.
_
D
eferred
(
false
).
resolve
().
cancel
();
deferred
.
then
(
function
()
{
deferred
.
then
(
function
()
{
ok
(
true
,
"Test non-cancellable deferred not cancelled manually"
);
ok
(
true
,
"Test non-cancellable deferred not cancelled manually"
);
...
@@ -1025,31 +1025,31 @@ test("jQuery._deferred()", function() {
...
@@ -1025,31 +1025,31 @@ test("jQuery._deferred()", function() {
deferred
.
then
();
deferred
.
then
();
}
}
deferred
=
jQuery
.
_
d
eferred
();
deferred
=
jQuery
.
_
D
eferred
();
deferred
.
fire
(
jQuery
,
[
document
]
).
then
(
function
(
doc
)
{
deferred
.
fire
(
jQuery
,
[
document
]
).
then
(
function
(
doc
)
{
ok
(
this
===
jQuery
&&
arguments
.
length
===
1
&&
doc
===
document
,
"Test fire context & args"
);
ok
(
this
===
jQuery
&&
arguments
.
length
===
1
&&
doc
===
document
,
"Test fire context & args"
);
});
});
});
});
test
(
"jQuery.
d
eferred()"
,
function
()
{
test
(
"jQuery.
D
eferred()"
,
function
()
{
expect
(
8
);
expect
(
8
);
jQuery
.
d
eferred
(
function
(
defer
)
{
jQuery
.
D
eferred
(
function
(
defer
)
{
strictEqual
(
this
,
defer
,
"Defer passed as this & first argument"
);
strictEqual
(
this
,
defer
,
"Defer passed as this & first argument"
);
this
.
resolve
(
"done"
);
this
.
resolve
(
"done"
);
}).
then
(
function
(
value
)
{
}).
then
(
function
(
value
)
{
strictEqual
(
value
,
"done"
,
"Passed function executed"
);
strictEqual
(
value
,
"done"
,
"Passed function executed"
);
});
});
jQuery
.
d
eferred
().
resolve
().
then
(
function
()
{
jQuery
.
D
eferred
().
resolve
().
then
(
function
()
{
ok
(
true
,
"Success on resolve"
);
ok
(
true
,
"Success on resolve"
);
}).
fail
(
function
()
{
}).
fail
(
function
()
{
ok
(
false
,
"Error on resolve"
);
ok
(
false
,
"Error on resolve"
);
});
});
jQuery
.
d
eferred
().
reject
().
then
(
function
()
{
jQuery
.
D
eferred
().
reject
().
then
(
function
()
{
ok
(
false
,
"Success on reject"
);
ok
(
false
,
"Success on reject"
);
}).
fail
(
function
()
{
}).
fail
(
function
()
{
ok
(
true
,
"Error on reject"
);
ok
(
true
,
"Error on reject"
);
...
@@ -1057,7 +1057,7 @@ test("jQuery.deferred()", function() {
...
@@ -1057,7 +1057,7 @@ test("jQuery.deferred()", function() {
var
flag
=
true
;
var
flag
=
true
;
jQuery
.
d
eferred
().
resolve
().
cancel
().
then
(
function
()
{
jQuery
.
D
eferred
().
resolve
().
cancel
().
then
(
function
()
{
ok
(
flag
=
false
,
"Success on resolve/cancel"
);
ok
(
flag
=
false
,
"Success on resolve/cancel"
);
}).
fail
(
function
()
{
}).
fail
(
function
()
{
ok
(
flag
=
false
,
"Error on resolve/cancel"
);
ok
(
flag
=
false
,
"Error on resolve/cancel"
);
...
@@ -1067,7 +1067,7 @@ test("jQuery.deferred()", function() {
...
@@ -1067,7 +1067,7 @@ test("jQuery.deferred()", function() {
flag
=
true
;
flag
=
true
;
jQuery
.
d
eferred
().
reject
().
cancel
().
then
(
function
()
{
jQuery
.
D
eferred
().
reject
().
cancel
().
then
(
function
()
{
ok
(
flag
=
false
,
"Success on reject/cancel"
);
ok
(
flag
=
false
,
"Success on reject/cancel"
);
}).
fail
(
function
()
{
}).
fail
(
function
()
{
ok
(
flag
=
false
,
"Error on reject/cancel"
);
ok
(
flag
=
false
,
"Error on reject/cancel"
);
...
@@ -1075,13 +1075,13 @@ test("jQuery.deferred()", function() {
...
@@ -1075,13 +1075,13 @@ test("jQuery.deferred()", function() {
ok
(
flag
,
"Cancel on reject"
);
ok
(
flag
,
"Cancel on reject"
);
jQuery
.
d
eferred
(
false
).
resolve
().
then
(
function
()
{
jQuery
.
D
eferred
(
false
).
resolve
().
then
(
function
()
{
return
false
;
return
false
;
}
,
function
()
{
}
,
function
()
{
ok
(
true
,
"Not cancelled on resolve"
);
ok
(
true
,
"Not cancelled on resolve"
);
});
});
jQuery
.
d
eferred
(
false
).
reject
().
fail
(
function
()
{
jQuery
.
D
eferred
(
false
).
reject
().
fail
(
function
()
{
return
false
;
return
false
;
}
,
function
()
{
}
,
function
()
{
ok
(
true
,
"Not cancelled on reject"
);
ok
(
true
,
"Not cancelled on reject"
);
...
@@ -1099,8 +1099,8 @@ test("jQuery.isDeferred()", function() {
...
@@ -1099,8 +1099,8 @@ test("jQuery.isDeferred()", function() {
object2
.
then
.
_
=
[];
object2
.
then
.
_
=
[];
// The use case that we want to match
// The use case that we want to match
ok
(
jQuery
.
isDeferred
(
jQuery
.
_
d
eferred
()),
"Simple deferred"
);
ok
(
jQuery
.
isDeferred
(
jQuery
.
_
D
eferred
()),
"Simple deferred"
);
ok
(
jQuery
.
isDeferred
(
jQuery
.
d
eferred
()),
"Failable deferred"
);
ok
(
jQuery
.
isDeferred
(
jQuery
.
D
eferred
()),
"Failable deferred"
);
// Some other objects
// Some other objects
ok
(
!
jQuery
.
isDeferred
(
object1
),
"Object with then & no marker"
);
ok
(
!
jQuery
.
isDeferred
(
object1
),
"Object with then & no marker"
);
...
@@ -1113,7 +1113,7 @@ test("jQuery.isDeferred()", function() {
...
@@ -1113,7 +1113,7 @@ test("jQuery.isDeferred()", function() {
ok
(
!
jQuery
.
isDeferred
(
null
),
"null"
);
ok
(
!
jQuery
.
isDeferred
(
null
),
"null"
);
ok
(
!
jQuery
.
isDeferred
(
undefined
),
"undefined"
);
ok
(
!
jQuery
.
isDeferred
(
undefined
),
"undefined"
);
object1
=
{
custom
:
jQuery
.
_
d
eferred
().
then
};
object1
=
{
custom
:
jQuery
.
_
D
eferred
().
then
};
ok
(
!
jQuery
.
isDeferred
(
object1
)
,
"custom method name not found automagically"
);
ok
(
!
jQuery
.
isDeferred
(
object1
)
,
"custom method name not found automagically"
);
ok
(
jQuery
.
isDeferred
(
object1
,
"custom"
)
,
"custom method name"
);
ok
(
jQuery
.
isDeferred
(
object1
,
"custom"
)
,
"custom method name"
);
...
@@ -1123,10 +1123,10 @@ test("jQuery.when()", function() {
...
@@ -1123,10 +1123,10 @@ test("jQuery.when()", function() {
expect
(
5
);
expect
(
5
);
var
cache
,
i
,
deferred
=
{
done
:
jQuery
.
d
eferred
().
resolve
(
1
).
then
};
var
cache
,
i
,
deferred
=
{
done
:
jQuery
.
D
eferred
().
resolve
(
1
).
then
};
for
(
i
=
1
;
i
<
3
;
i
++
)
{
for
(
i
=
1
;
i
<
3
;
i
++
)
{
jQuery
.
when
(
cache
||
jQuery
.
d
eferred
(
function
()
{
jQuery
.
when
(
cache
||
jQuery
.
D
eferred
(
function
()
{
this
.
resolve
(
i
);
this
.
resolve
(
i
);
})
).
then
(
function
(
value
)
{
})
).
then
(
function
(
value
)
{
strictEqual
(
value
,
1
,
"Function executed"
+
(
i
>
1
?
" only once"
:
""
)
);
strictEqual
(
value
,
1
,
"Function executed"
+
(
i
>
1
?
" only once"
:
""
)
);
...
...
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