mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support file:/// URIs in Zotero.HTTP.promise()

Browse source
This commit is contained in:
Simon Kornblith 2013-04-03 14:37:02 -04:00
parent 5e237a2723
commit 2b8c28ccaf
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
chrome/content/zotero/xpcom/http.js
View file

@ -121,18 +121,20 @@ Zotero.HTTP = new function() {
}
// Send cookie even if "Allow third-party cookies" is disabled (>=Fx3.6 only)
var channel = xmlhttp.channel;
channel.QueryInterface(Components.interfaces.nsIHttpChannelInternal);
channel.forceAllowThirdPartyCookie = true;
// Set charset
if (options && options.responseCharset) {
channel.contentCharset = responseCharset;
}
// Disable caching if requested
if(options && options.dontCache) {
channel.loadFlags |= Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE;
var channel = xmlhttp.channel,
isFile = channel instanceof Components.interfaces.nsIFileChannel;
if(channel instanceof Components.interfaces.nsIHttpChannelInternal) {
channel.forceAllowThirdPartyCookie = true;
// Set charset
if (options && options.responseCharset) {
channel.contentCharset = responseCharset;
}
// Disable caching if requested
if(options && options.dontCache) {
channel.loadFlags |= Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE;
}
}
// Set responseType
@ -155,6 +157,9 @@ Zotero.HTTP = new function() {
if (options && options.successCodes) {
var success = options.successCodes.indexOf(status) != -1;
}
else if(isFile) {
var success = status == 200 || status == 0;
}
else {
var success = status >= 200 && status < 300;
}