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

Merge pull request #229 from aurimasv/args

Browse source 
Add a way for translators to pass arguments to callbacks for HTTP requests
This commit is contained in:
Simon Kornblith 2013-01-31 20:00:53 -08:00
commit b08e52363b
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -576,9 +576,10 @@ Zotero.HTTP = new function() {
/** /**
* Handler for XMLHttpRequest state change * Handler for XMLHttpRequest state change
* *
* @param {nsIXMLHttpRequest} XMLHttpRequest whose state just changed * @param {nsIXMLHttpRequest} xmlhttp XMLHttpRequest whose state just changed
* @param {Function} [onDone] Callback for request completion * @param {Function} [callback] Callback for request completion
* @param {String} [responseCharset] Character set to force on the response * @param {String} [responseCharset] Character set to force on the response
* @param {*} [data] Data to be passed back to callback as the second argument
* @private * @private
*/ */
function _stateChange(xmlhttp, callback, responseCharset, data) { function _stateChange(xmlhttp, callback, responseCharset, data) {

10
chrome/content/zotero/xpcom/utilities_translate.js
View file

@ -208,14 +208,22 @@ Zotero.Utilities.Translate.prototype.processDocuments = function(urls, processor
var translate = this._translate; var translate = this._translate;
if(exception) { if(exception) {
var myException = function(e) { var myException = function(e) {
var browserDeleted;
try { try {
exception(e); exception(e);
} catch(e) { } catch(e) {
try { try {
Zotero.Browser.deleteHiddenBrowser(hiddenBrowser); Zotero.Browser.deleteHiddenBrowser(hiddenBrowser);
} catch(e) {} } catch(e) {}
browserDeleted = true;
translate.complete(false, e); translate.complete(false, e);
} }
if(!browserDeleted) {
try {
Zotero.Browser.deleteHiddenBrowser(hiddenBrowser);
} catch(e) {}
}
} }
} else { } else {
var myException = function(e) { var myException = function(e) {
@ -402,7 +410,7 @@ Zotero.Utilities.Translate.prototype.doGet = function(urls, processor, done, res
} }
if(callAgain) { if(callAgain) {
me.doGet(urls, processor, done); me.doGet(urls, processor, done, responseCharset);
} else { } else {
if(done) { if(done) {
done(); done();