commit eed6d2f22c046fb29547645aebdca4d29bac1a50
parent 0eb4db7c33b47308cfe39a0d28d42b1f71041ae3
Author: aurimasv <aurimas.dev@gmail.com>
Date: Sat, 19 Jan 2013 20:05:21 -0600
Pass responseCharset to subsequent doGet calls
Diffstat:
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
@@ -576,9 +576,10 @@ Zotero.HTTP = new function() {
/**
* Handler for XMLHttpRequest state change
*
- * @param {nsIXMLHttpRequest} XMLHttpRequest whose state just changed
- * @param {Function} [onDone] Callback for request completion
+ * @param {nsIXMLHttpRequest} xmlhttp XMLHttpRequest whose state just changed
+ * @param {Function} [callback] Callback for request completion
* @param {String} [responseCharset] Character set to force on the response
+ * @param {*} [data] Data to be passed back to callback as the second argument
* @private
*/
function _stateChange(xmlhttp, callback, responseCharset, data) {
diff --git a/chrome/content/zotero/xpcom/utilities_translate.js b/chrome/content/zotero/xpcom/utilities_translate.js
@@ -402,7 +402,7 @@ Zotero.Utilities.Translate.prototype.doGet = function(urls, processor, done, res
}
if(callAgain) {
- me.doGet(urls, processor, done);
+ me.doGet(urls, processor, done, responseCharset);
} else {
if(done) {
done();