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
1ca82ccd
Commit
1ca82ccd
authored
Jan 06, 2011
by
jaubourg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed "complete" to "done" in order to avoid conflicts with jXHR.complete.
parent
47e4cc1a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
ajax.js
src/ajax.js
+2
-2
core.js
src/core.js
+8
-8
core.js
test/unit/core.js
+11
-11
No files found.
src/ajax.js
View file @
1ca82ccd
...
@@ -496,9 +496,9 @@ jQuery.extend({
...
@@ -496,9 +496,9 @@ jQuery.extend({
// Attach deferreds
// Attach deferreds
deferred
.
promise
(
jXHR
);
deferred
.
promise
(
jXHR
);
jXHR
.
success
=
jXHR
.
complet
e
;
jXHR
.
success
=
jXHR
.
don
e
;
jXHR
.
error
=
jXHR
.
fail
;
jXHR
.
error
=
jXHR
.
fail
;
jXHR
.
complete
=
completeDeferred
.
complet
e
;
jXHR
.
complete
=
completeDeferred
.
don
e
;
// Remove hash character (#7531: and string promotion)
// Remove hash character (#7531: and string promotion)
s
.
url
=
(
""
+
s
.
url
).
replace
(
rhash
,
""
);
s
.
url
=
(
""
+
s
.
url
).
replace
(
rhash
,
""
);
...
...
src/core.js
View file @
1ca82ccd
...
@@ -258,7 +258,7 @@ jQuery.fn = jQuery.prototype = {
...
@@ -258,7 +258,7 @@ jQuery.fn = jQuery.prototype = {
jQuery
.
bindReady
();
jQuery
.
bindReady
();
// Change ready & apply
// Change ready & apply
return
(
jQuery
.
fn
.
ready
=
readyList
.
complet
e
).
apply
(
this
,
arguments
);
return
(
jQuery
.
fn
.
ready
=
readyList
.
don
e
).
apply
(
this
,
arguments
);
},
},
eq
:
function
(
i
)
{
eq
:
function
(
i
)
{
...
@@ -815,8 +815,8 @@ jQuery.extend({
...
@@ -815,8 +815,8 @@ jQuery.extend({
// the deferred itself
// the deferred itself
deferred
=
{
deferred
=
{
//
complet
e( f1, f2, ...)
//
don
e( f1, f2, ...)
complet
e
:
function
()
{
don
e
:
function
()
{
if
(
!
cancelled
)
{
if
(
!
cancelled
)
{
...
@@ -836,7 +836,7 @@ jQuery.extend({
...
@@ -836,7 +836,7 @@ jQuery.extend({
elem
=
args
[
i
];
elem
=
args
[
i
];
type
=
jQuery
.
type
(
elem
);
type
=
jQuery
.
type
(
elem
);
if
(
type
===
"array"
)
{
if
(
type
===
"array"
)
{
deferred
.
complet
e
.
apply
(
deferred
,
elem
);
deferred
.
don
e
.
apply
(
deferred
,
elem
);
}
else
if
(
type
===
"function"
)
{
}
else
if
(
type
===
"function"
)
{
callbacks
.
push
(
elem
);
callbacks
.
push
(
elem
);
}
}
...
@@ -901,11 +901,11 @@ jQuery.extend({
...
@@ -901,11 +901,11 @@ jQuery.extend({
// Add errorDeferred methods and redefine cancel
// Add errorDeferred methods and redefine cancel
jQuery
.
extend
(
deferred
,
{
jQuery
.
extend
(
deferred
,
{
then
:
function
(
complet
eCallbacks
,
failCallbacks
)
{
then
:
function
(
don
eCallbacks
,
failCallbacks
)
{
deferred
.
complete
(
complet
eCallbacks
).
fail
(
failCallbacks
);
deferred
.
done
(
don
eCallbacks
).
fail
(
failCallbacks
);
return
this
;
return
this
;
},
},
fail
:
failDeferred
.
complet
e
,
fail
:
failDeferred
.
don
e
,
fireReject
:
failDeferred
.
fire
,
fireReject
:
failDeferred
.
fire
,
reject
:
failDeferred
.
resolve
,
reject
:
failDeferred
.
resolve
,
isRejected
:
failDeferred
.
isResolved
,
isRejected
:
failDeferred
.
isResolved
,
...
@@ -913,7 +913,7 @@ jQuery.extend({
...
@@ -913,7 +913,7 @@ jQuery.extend({
// If obj is provided, the promise aspect is added to the object
// If obj is provided, the promise aspect is added to the object
promise
:
function
(
obj
)
{
promise
:
function
(
obj
)
{
obj
=
obj
||
{};
obj
=
obj
||
{};
jQuery
.
each
(
"then
complet
e fail isResolved isRejected"
.
split
(
" "
)
,
function
(
_
,
method
)
{
jQuery
.
each
(
"then
don
e fail isResolved isRejected"
.
split
(
" "
)
,
function
(
_
,
method
)
{
obj
[
method
]
=
deferred
[
method
];
obj
[
method
]
=
deferred
[
method
];
});
});
obj
.
promise
=
function
()
{
obj
.
promise
=
function
()
{
...
...
test/unit/core.js
View file @
1ca82ccd
...
@@ -915,7 +915,7 @@ test("jQuery._Deferred()", function() {
...
@@ -915,7 +915,7 @@ test("jQuery._Deferred()", function() {
test
=
false
;
test
=
false
;
deferred
.
complet
e
(
function
(
value
)
{
deferred
.
don
e
(
function
(
value
)
{
equals
(
value
,
"value"
,
"Test pre-resolve callback"
);
equals
(
value
,
"value"
,
"Test pre-resolve callback"
);
test
=
true
;
test
=
true
;
}
);
}
);
...
@@ -926,7 +926,7 @@ test("jQuery._Deferred()", function() {
...
@@ -926,7 +926,7 @@ test("jQuery._Deferred()", function() {
test
=
false
;
test
=
false
;
deferred
.
complet
e
(
function
(
value
)
{
deferred
.
don
e
(
function
(
value
)
{
equals
(
value
,
"value"
,
"Test post-resolve callback"
);
equals
(
value
,
"value"
,
"Test post-resolve callback"
);
test
=
true
;
test
=
true
;
}
);
}
);
...
@@ -937,7 +937,7 @@ test("jQuery._Deferred()", function() {
...
@@ -937,7 +937,7 @@ test("jQuery._Deferred()", function() {
test
=
true
;
test
=
true
;
deferred
.
complet
e
(
function
()
{
deferred
.
don
e
(
function
()
{
ok
(
false
,
"Cancel was ignored"
);
ok
(
false
,
"Cancel was ignored"
);
test
=
false
;
test
=
false
;
}
);
}
);
...
@@ -947,18 +947,18 @@ test("jQuery._Deferred()", function() {
...
@@ -947,18 +947,18 @@ test("jQuery._Deferred()", function() {
deferred
=
jQuery
.
_Deferred
().
resolve
();
deferred
=
jQuery
.
_Deferred
().
resolve
();
try
{
try
{
deferred
.
complet
e
(
function
()
{
deferred
.
don
e
(
function
()
{
throw
"Error"
;
throw
"Error"
;
}
,
function
()
{
}
,
function
()
{
ok
(
true
,
"Test deferred do not cancel on exception"
);
ok
(
true
,
"Test deferred do not cancel on exception"
);
}
);
}
);
}
catch
(
e
)
{
}
catch
(
e
)
{
strictEqual
(
e
,
"Error"
,
"Test deferred propagates exceptions"
);
strictEqual
(
e
,
"Error"
,
"Test deferred propagates exceptions"
);
deferred
.
complet
e
();
deferred
.
don
e
();
}
}
test
=
""
;
test
=
""
;
deferred
=
jQuery
.
_Deferred
().
complet
e
(
function
()
{
deferred
=
jQuery
.
_Deferred
().
don
e
(
function
()
{
test
+=
"A"
;
test
+=
"A"
;
...
@@ -968,13 +968,13 @@ test("jQuery._Deferred()", function() {
...
@@ -968,13 +968,13 @@ test("jQuery._Deferred()", function() {
}
).
resolve
();
}
).
resolve
();
strictEqual
(
test
,
"AB"
,
"Test multiple
complet
e parameters"
);
strictEqual
(
test
,
"AB"
,
"Test multiple
don
e parameters"
);
test
=
""
;
test
=
""
;
deferred
.
complet
e
(
function
()
{
deferred
.
don
e
(
function
()
{
deferred
.
complet
e
(
function
()
{
deferred
.
don
e
(
function
()
{
test
+=
"C"
;
test
+=
"C"
;
...
@@ -987,11 +987,11 @@ test("jQuery._Deferred()", function() {
...
@@ -987,11 +987,11 @@ test("jQuery._Deferred()", function() {
test
+=
"B"
;
test
+=
"B"
;
}
);
}
);
strictEqual
(
test
,
"ABC"
,
"Test
complet
e callbacks order"
);
strictEqual
(
test
,
"ABC"
,
"Test
don
e callbacks order"
);
deferred
=
jQuery
.
_Deferred
();
deferred
=
jQuery
.
_Deferred
();
deferred
.
fire
(
jQuery
,
[
document
]
).
complet
e
(
function
(
doc
)
{
deferred
.
fire
(
jQuery
,
[
document
]
).
don
e
(
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"
);
});
});
});
});
...
...
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