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
a2dbdc1f
Commit
a2dbdc1f
authored
Feb 07, 2011
by
jaubourg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes a bug that prevented headers from being set in an ajaxSend callback. Unit test modified.
parent
0c21c83e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
ajax.js
src/ajax.js
+2
-2
ajax.js
test/unit/ajax.js
+12
-5
No files found.
src/ajax.js
View file @
a2dbdc1f
...
@@ -684,8 +684,7 @@ jQuery.extend({
...
@@ -684,8 +684,7 @@ jQuery.extend({
if
(
!
transport
)
{
if
(
!
transport
)
{
done
(
-
1
,
"No Transport"
);
done
(
-
1
,
"No Transport"
);
}
else
{
}
else
{
// Set state as sending
jqXHR
.
readyState
=
1
;
state
=
jqXHR
.
readyState
=
1
;
// Send global event
// Send global event
if
(
fireGlobals
)
{
if
(
fireGlobals
)
{
globalEventContext
.
trigger
(
"ajaxSend"
,
[
jqXHR
,
s
]
);
globalEventContext
.
trigger
(
"ajaxSend"
,
[
jqXHR
,
s
]
);
...
@@ -698,6 +697,7 @@ jQuery.extend({
...
@@ -698,6 +697,7 @@ jQuery.extend({
}
}
try
{
try
{
state
=
1
;
transport
.
send
(
requestHeaders
,
done
);
transport
.
send
(
requestHeaders
,
done
);
}
catch
(
e
)
{
}
catch
(
e
)
{
// Propagate exception as error if not done
// Propagate exception as error if not done
...
...
test/unit/ajax.js
View file @
a2dbdc1f
...
@@ -348,6 +348,10 @@ test(".ajax() - headers" , function() {
...
@@ -348,6 +348,10 @@ test(".ajax() - headers" , function() {
stop
();
stop
();
jQuery
(
'#foo'
).
ajaxSend
(
function
(
evt
,
xhr
)
{
xhr
.
setRequestHeader
(
"ajax-send"
,
"test"
);
});
var
requestHeaders
=
{
var
requestHeaders
=
{
siMPle
:
"value"
,
siMPle
:
"value"
,
"SometHing-elsE"
:
"other value"
,
"SometHing-elsE"
:
"other value"
,
...
@@ -359,22 +363,25 @@ test(".ajax() - headers" , function() {
...
@@ -359,22 +363,25 @@ test(".ajax() - headers" , function() {
for
(
i
in
requestHeaders
)
{
for
(
i
in
requestHeaders
)
{
list
.
push
(
i
);
list
.
push
(
i
);
}
}
list
.
push
(
"ajax-send"
);
jQuery
.
ajax
(
url
(
"data/headers.php?keys="
+
list
.
join
(
"_"
)
),
{
jQuery
.
ajax
(
url
(
"data/headers.php?keys="
+
list
.
join
(
"_"
)
),
{
headers
:
requestHeaders
,
headers
:
requestHeaders
,
success
:
function
(
data
,
_
,
xhr
)
{
success
:
function
(
data
,
_
,
xhr
)
{
var
tmp
=
[];
var
tmp
=
[];
for
(
i
in
requestHeaders
)
{
for
(
i
in
requestHeaders
)
{
tmp
.
push
(
i
,
": "
,
requestHeaders
[
i
]
,
"
\n
"
);
tmp
.
push
(
i
,
": "
,
requestHeaders
[
i
]
,
"
\n
"
);
}
}
tmp
.
push
(
"ajax-send: test
\n
"
);
tmp
=
tmp
.
join
(
""
);
tmp
=
tmp
.
join
(
""
);
equals
(
data
,
tmp
,
"Headers were sent"
);
equals
(
data
,
tmp
,
"Headers were sent"
);
equals
(
xhr
.
getResponseHeader
(
"Sample-Header"
)
,
"Hello World"
,
"Sample header received"
);
equals
(
xhr
.
getResponseHeader
(
"Sample-Header"
)
,
"Hello World"
,
"Sample header received"
);
start
();
},
},
error
:
function
(){
ok
(
false
,
"error"
);
}
error
:
function
(){
ok
(
false
,
"error"
);
}
});
}).
then
(
start
,
start
);
});
});
...
...
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