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 CAE9C106CE for ; Mon, 3 Mar 2014 16:59:10 +0000 (UTC) Received: (qmail 41605 invoked by uid 500); 3 Mar 2014 16:58:48 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 41070 invoked by uid 500); 3 Mar 2014 16:58:31 -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 40273 invoked by uid 99); 3 Mar 2014 16:58:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 16:58:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4FD2E933CF9; Mon, 3 Mar 2014 16:58:15 +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 Date: Mon, 03 Mar 2014 16:58:44 -0000 Message-Id: <2f951fa4f58f4e25869fc09e061dda71@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/34] couchdb commit: updated refs/heads/paginate-api-options to b63c791 Continued work Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0901b9bb Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0901b9bb Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0901b9bb Branch: refs/heads/paginate-api-options Commit: 0901b9bbd6ba43652d27210be1b809186777bd6c Parents: 747e004 Author: Garren Smith Authored: Fri Feb 21 06:06:03 2014 +0200 Committer: Garren Smith Committed: Mon Mar 3 11:18:43 2014 +0200 ---------------------------------------------------------------------- src/fauxton/app/addons/documents/resources.js | 2 +- src/fauxton/app/addons/documents/views.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/0901b9bb/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 c5a2e2c..69c9e1a 100644 --- a/src/fauxton/app/addons/documents/resources.js +++ b/src/fauxton/app/addons/documents/resources.js @@ -33,7 +33,7 @@ function(app, FauxtonAPI) { throw "Require docs to paginate"; } - var params = _.reduce(['reduce', 'keys', 'endkey', 'descending', 'inclusive_end'], function (params, key) { + var params = _.reduce(['reduce', 'keys', 'key', 'endkey', 'descending', 'inclusive_end'], function (params, key) { if (_.has(currentParams, key)) { params[key] = currentParams[key]; } http://git-wip-us.apache.org/repos/asf/couchdb/blob/0901b9bb/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 5468948..f80d07e 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -457,7 +457,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum database: app.utils.safeURLName(this.collection.database.id), updateSeq: updateSeq, totalRows: totalRows, - numModels: this.collection.models.length + recordStart - 1, pageStart: pageStart, pageEnd: pageEnd };