[23/52] [abbrv] fauxton commit: updated refs/heads/import-master to d11b90b

[da...@apache.org]

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 <de...@apache.org>
Authored: Thu Jan 16 09:48:42 2014 -0500
Committer: suelockwood <de...@apache.org>
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);
+});