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
3f648c4e
Commit
3f648c4e
authored
Jan 05, 2010
by
jeresig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure that the ActiveX exception is caught if it's unable to be loaded. Fixes #2849.
parent
b2289f3e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
ajax.js
src/ajax.js
+12
-3
No files found.
src/ajax.js
View file @
3f648c4e
...
...
@@ -179,9 +179,14 @@ jQuery.extend({
// so we use the ActiveXObject when it is available
// This function can be overriden by calling jQuery.ajaxSetup
xhr
:
function
()
{
return
window
.
XMLHttpRequest
&&
window
.
location
.
protocol
!==
"file:"
||
window
.
ActiveXObject
?
new
window
.
XMLHttpRequest
()
:
new
window
.
ActiveXObject
(
"Microsoft.XMLHTTP"
);
if
(
window
.
XMLHttpRequest
&&
(
window
.
location
.
protocol
!==
"file:"
||
!
window
.
ActiveXObject
)
)
{
return
new
window
.
XMLHttpRequest
();
}
else
{
try
{
return
new
window
.
ActiveXObject
(
"Microsoft.XMLHTTP"
);
}
catch
(
e
)
{}
}
},
accepts
:
{
xml
:
"application/xml, text/xml"
,
...
...
@@ -326,6 +331,10 @@ jQuery.extend({
// Create the request object
var
xhr
=
s
.
xhr
();
if
(
!
xhr
)
{
return
;
}
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if
(
s
.
username
)
{
...
...
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