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

Fix Firefox connector breakage after 69ab4b0b1

Browse source 
This also makes a few changes to `callMethod`:

- Removes the deprecation warning when a string is passed and removes the
  `httpMethod` `options` property. Any call that passes a string and includes
  `data` can just remain as a POST. If `data` is null or undefined, a `GET`
  will be sent. (If we find ourselves needing other methods, we can reevaluate.)
- Renames `httpHeaders` to `headers` for consistency with other code (and in the
  absence of `httpMethod`)
This commit is contained in:
Dan Stillman 2016-12-03 04:28:44 -05:00
parent 44e06eec08
commit ee798dde16
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
chrome/content/zotero/xpcom/connector/connector.js
View file

@ -139,13 +139,13 @@ Zotero.Connector = new function() {
/**
* Sends the XHR to execute an RPC call.
*
* @param {Object} options
* method - method name
* queryString - a querystring to pass on the HTTP call
* httpMethod - GET|POST
* httpHeaders - an object of HTTP headers to send
* @param {Object} data RPC data. See documentation above.
* @param {Function} callback Function to be called when requests complete.
* @param {String|Object} options - The method name as a string or an object with the
* following properties:
* method - method name
* headers - an object of HTTP headers to send
* queryString - a query string to pass on the HTTP call
* @param {Object} data - RPC data to POST. If null or undefined, a GET request is sent.
* @param {Function} callback - Function to be called when requests complete.
*/
this.callMethod = function(options, data, callback, tab) {
// Don't bother trying if not online in bookmarklet
@ -154,17 +154,18 @@ Zotero.Connector = new function() {
return;
}
if (typeof options == 'string') {
Zotero.debug('Zotero.Connector.callMethod() now takes an object instead of a string for method. Update your code.');
options = {method: options};
}
var method = options.method;
var sendRequest = options.httpMethod == 'GET' ? Zotero.HTTP.doGet : Zotero.HTTP.doPost;
var httpHeaders = Object.assign({
var sendRequest = (data === null || data === undefined)
? Zotero.HTTP.doGet.bind(Zotero.HTTP)
: Zotero.HTTP.doPost.bind(Zotero.HTTP);
var headers = Object.assign({
"Content-Type":"application/json",
"X-Zotero-Version":Zotero.version,
"X-Zotero-Connector-API-Version":CONNECTOR_API_VERSION
}, options.httpHeaders);
var queryString = options.queryString;
}, options.headers);
var queryString = options.queryString ? ("?" + options.queryString) : "";
var newCallback = function(req) {
try {
@ -219,11 +220,11 @@ Zotero.Connector = new function() {
callback(false, 0);
}
} else { // Other browsers can use plain doPost
var uri = CONNECTOR_URI+"connector/" + method + '?' + queryString;
if (httpHeaders["Content-Type"] == 'application/json') {
var uri = CONNECTOR_URI + "connector/" + method + queryString;
if (headers["Content-Type"] == 'application/json') {
data = JSON.stringify(data);
}
sendRequest(uri, data, newCallback, httpHeaders);
sendRequest(uri, data, newCallback, headers);
}
},