Skip to content

Commit 5532147

Browse files
author
Jason Moon
committed
Implement changes suggested by pull request 10
1 parent c0b3520 commit 5532147

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

jQuery.XDomainRequest.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if (!jQuery.support.cors && jQuery.ajaxTransport && window.XDomainRequest) {
4040
try {
4141
if ((userType === 'json') || ((userType !== 'text') && jsonRegEx.test(xdr.contentType))) {
4242
try {
43-
responses.json = $.parseJSON(xdr.responseText);
43+
responses.json = jQuery.parseJSON(xdr.responseText);
4444
} catch(e) {
4545
status.code = 500;
4646
status.message = 'parseerror';
@@ -67,14 +67,17 @@ if (!jQuery.support.cors && jQuery.ajaxTransport && window.XDomainRequest) {
6767
complete(status.code, status.message, responses, allResponseHeaders);
6868
}
6969
};
70-
//set an empty handler for 'onprogress' so requests don't get aborted
70+
// set an empty handler for 'onprogress' so requests don't get aborted
7171
xdr.onprogress = function(){};
7272
xdr.onerror = function(){
7373
complete(500, 'error', {
7474
text: xdr.responseText
7575
});
7676
};
77-
var postData = (userOptions.data && $.param(userOptions.data)) || '';
77+
var postData = '';
78+
if (userOptions.data) {
79+
postData = (jQuery.type(userOptions.data) === 'string') ? userOptions.data : jQuery.param(userOptions.data);
80+
}
7881
xdr.open(options.type, options.url);
7982
xdr.send(postData);
8083
},

0 commit comments

Comments
 (0)