From 8e1e57daba4845eb6091957230dc09a1ab83a00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= Date: Thu, 13 Aug 2015 14:29:14 -0300 Subject: [PATCH] Merge pull request #111 from Automattic/fix/parting-query-parameter Fix/parting query parameter --- packages/wpcom.js/dist/wpcom.js | 10 +++---- .../wpcom.js/examples/browser-cors/batch.html | 28 +++++++++++++++++++ .../wpcom.js/examples/browser-cors/index.html | 7 ++--- .../examples/browser-proxy/batch.html | 13 ++++----- packages/wpcom.js/lib/batch.js | 2 +- packages/wpcom.js/lib/util/send-request.js | 8 +++--- 6 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 packages/wpcom.js/examples/browser-cors/batch.html diff --git a/packages/wpcom.js/dist/wpcom.js b/packages/wpcom.js/dist/wpcom.js index eb988e411eb54..d2cb059a16277 100644 --- a/packages/wpcom.js/dist/wpcom.js +++ b/packages/wpcom.js/dist/wpcom.js @@ -50,7 +50,7 @@ Batch.prototype.run = function (query, fn) { } // add urls to query object - query['urls[]'] = this.urls; + query['urls'] = this.urls; return this.wpcom.req.get('/batch', query, fn); }; @@ -1838,9 +1838,6 @@ module.exports = function (params, query, body, fn) { // query could be `null` query = query || {}; - // pass `query` and/or `body` to request params - params.query = query; - // Handle special query parameters // - `apiVersion` if (query.apiVersion) { @@ -1859,7 +1856,10 @@ module.exports = function (params, query, body, fn) { } // Stringify query object before to send - query = qs.stringify(query); + query = qs.stringify(query, { arrayFormat: 'brackets' }); + + // pass `query` and/or `body` to request params + params.query = query; if (body) { params.body = body; diff --git a/packages/wpcom.js/examples/browser-cors/batch.html b/packages/wpcom.js/examples/browser-cors/batch.html new file mode 100644 index 0000000000000..98f9d67766498 --- /dev/null +++ b/packages/wpcom.js/examples/browser-cors/batch.html @@ -0,0 +1,28 @@ + + + + wpcom.js browser example with CORS + + + + + + + + diff --git a/packages/wpcom.js/examples/browser-cors/index.html b/packages/wpcom.js/examples/browser-cors/index.html index b1f0be541da90..9540aecd7f833 100644 --- a/packages/wpcom.js/examples/browser-cors/index.html +++ b/packages/wpcom.js/examples/browser-cors/index.html @@ -5,16 +5,13 @@ - +