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 74A301015B for ; Wed, 12 Feb 2014 06:24:33 +0000 (UTC) Received: (qmail 2490 invoked by uid 500); 12 Feb 2014 06:20:28 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 2360 invoked by uid 500); 12 Feb 2014 06:20:23 -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 1354 invoked by uid 99); 12 Feb 2014 06:19:57 -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, 12 Feb 2014 06:19:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6FEE6553E0; Wed, 12 Feb 2014 06:19:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Wed, 12 Feb 2014 06:20:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/52] [abbrv] fauxton commit: updated refs/heads/import-master to d11b90b Fix for view preview bug with _count Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8a2f0c25 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8a2f0c25 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8a2f0c25 Branch: refs/heads/import-master Commit: 8a2f0c2525da3edc1d6265a4e63f1cecabab49b7 Parents: 733c71e Author: suelockwood Authored: Thu Jan 16 09:48:42 2014 -0500 Committer: suelockwood Committed: Thu Jan 16 09:48:42 2014 -0500 ---------------------------------------------------------------------- app/addons/documents/views.js | 6 +++--- app/addons/pouchdb/pouch.collate.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a2f0c25/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js index 9902541..bde08f8 100644 --- a/app/addons/documents/views.js +++ b/app/addons/documents/views.js @@ -1476,12 +1476,12 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum var promise = FauxtonAPI.Deferred(); - if (!this.database.allDocs) { + if (!this.database.allDocs || this.database.allDocs.params.include_docs !== true) { this.database.buildAllDocs({limit: Databases.DocLimit.toString(), include_docs: true}); promise = this.database.allDocs.fetch(); - } else { + } else { promise.resolve(); - } + } promise.then(function () { params.docs = that.database.allDocs.map(function (model) { return model.get('doc');}); http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a2f0c25/app/addons/pouchdb/pouch.collate.js ---------------------------------------------------------------------- diff --git a/app/addons/pouchdb/pouch.collate.js b/app/addons/pouchdb/pouch.collate.js index 31e5650..8f15808 100644 --- a/app/addons/pouchdb/pouch.collate.js +++ b/app/addons/pouchdb/pouch.collate.js @@ -110,6 +110,6 @@ function(app, FauxtonAPI, Collate) { return Pouch; -}).call(this); +});