You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/02/11 16:25:46 UTC
[19/22] couchdb commit: updated refs/heads/paginate-api-options to
33118af
More working
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/144144b7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/144144b7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/144144b7
Branch: refs/heads/paginate-api-options
Commit: 144144b74fd63876809d968f124e3b2f2da68a25
Parents: 058fc3b
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Jan 29 17:44:49 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Feb 11 10:14:25 2014 +0200
----------------------------------------------------------------------
src/fauxton/app/addons/documents/resources.js | 2 ++
src/fauxton/app/addons/fauxton/components.js | 11 +++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/144144b7/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 15d4d30..72cdb66 100644
--- a/src/fauxton/app/addons/documents/resources.js
+++ b/src/fauxton/app/addons/documents/resources.js
@@ -284,6 +284,8 @@ function(app, FauxtonAPI) {
this.totalRowsToPaginate = 100;
this.on("remove",this.decrementTotalRows , this);
this.perPageLimit = options.perPageLimit || 20;
+
+ this.params.limit = this.perPageLimit;
},
url: function(context) {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/144144b7/src/fauxton/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/components.js b/src/fauxton/app/addons/fauxton/components.js
index ec10132..fd45aa2 100644
--- a/src/fauxton/app/addons/fauxton/components.js
+++ b/src/fauxton/app/addons/fauxton/components.js
@@ -89,7 +89,6 @@ function(app, FauxtonAPI, ace, spin) {
return false;
}
- console.log(this.pageStart() + this.perPage, this.docLimit);
if ((this.pageStart() + this.perPage) >= this.docLimit) {
return false;
}
@@ -119,9 +118,16 @@ function(app, FauxtonAPI, ace, spin) {
this.pageNumber = this.pageNumber + 1;
this.incPageStart();
+ var documentsLeftToFetch = this.docLimit - (this.pageNumber * this.perPage),
+ limit = this.perPage;
+
+ if (documentsLeftToFetch < this.perPage) {
+ limit = documentsLeftToFetch;
+ }
+
FauxtonAPI.triggerRouteEvent('paginate', {
direction: 'next',
- perPage: this.perPage
+ perPage: limit
});
},
@@ -163,6 +169,7 @@ function(app, FauxtonAPI, ace, spin) {
return this.page() + this.collection.length;
}
+ return this.page() + this.perPage;
}
});