Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2CE13109FF for ; Wed, 28 May 2014 10:46:44 +0000 (UTC) Received: (qmail 15624 invoked by uid 500); 28 May 2014 10:46:44 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 15570 invoked by uid 500); 28 May 2014 10:46:44 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 15563 invoked by uid 99); 28 May 2014 10:46:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2014 10:46:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D4D2C8C51D4; Wed, 28 May 2014 10:46:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Message-Id: <86af7b4cd7ad4af19e45f0253e6385ba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to 31c7ce7 Date: Wed, 28 May 2014 10:46:43 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/master 9fb9b4b79 -> 31c7ce756 Fauxton: Query Parse url Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/31c7ce75 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/31c7ce75 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/31c7ce75 Branch: refs/heads/master Commit: 31c7ce756645041c67221a267cc901ea6eea15ce Parents: 9fb9b4b Author: Garren Smith Authored: Wed May 28 12:46:32 2014 +0200 Committer: Garren Smith Committed: Wed May 28 12:46:32 2014 +0200 ---------------------------------------------------------------------- src/fauxton/app/addons/documents/resources.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/31c7ce75/src/fauxton/app/addons/documents/resources.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/resources.js b/src/fauxton/app/addons/documents/resources.js index ad61e78..709d9a9 100644 --- a/src/fauxton/app/addons/documents/resources.js +++ b/src/fauxton/app/addons/documents/resources.js @@ -414,6 +414,7 @@ function(app, FauxtonAPI, PagingCollection) { urlRef: function(context, params) { var query = ""; + if (params) { if (!_.isEmpty(params)) { query = "?" + $.param(params); @@ -421,7 +422,8 @@ function(app, FauxtonAPI, PagingCollection) { query = ''; } } else if (this.params) { - query = "?" + $.param(this.params); + var parsedParam = Documents.QueryParams.stringify(this.params); + query = "?" + $.param(parsedParam); } var startOfUrl = app.host;