couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject fauxton commit: updated refs/heads/master to cfdc7f9
Date Wed, 17 Dec 2014 19:15:42 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 06f1b351a -> cfdc7f98f


Fix for doc nav

Closes COUCHDB-2500


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/cfdc7f98
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/cfdc7f98
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/cfdc7f98

Branch: refs/heads/master
Commit: cfdc7f98fadc5394ae8547a6dd93bc3036ab5f2b
Parents: 06f1b35
Author: Benjamin Keen <ben.keen@gmail.com>
Authored: Mon Dec 8 16:01:14 2014 -0800
Committer: Benjamin Keen <ben.keen@gmail.com>
Committed: Wed Dec 17 11:16:27 2014 -0800

----------------------------------------------------------------------
 app/addons/documents/routes-documents.js            | 3 +++
 app/addons/documents/templates/all_docs_number.html | 2 +-
 app/addons/documents/views.js                       | 2 +-
 app/addons/fauxton/components.js                    | 2 --
 4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cfdc7f98/app/addons/documents/routes-documents.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-documents.js b/app/addons/documents/routes-documents.js
index 2ee5985..f38e06f 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -499,6 +499,7 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases,
Resou
       this.perPage = perPage;
       this.documentsView.forceRender();
       this.documentsView.collection.pageSizeReset(perPage, {fetch: false});
+      this.allDocsNumber.forceRender();
       this.setDocPerPageLimit(perPage);
     },
 
@@ -507,6 +508,8 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases,
Resou
       this.documentsView.collection.reset(collection);
 
       this.documentsView.forceRender();
+      this.allDocsNumber.forceRender();
+
       collection.paging.pageSize = options.perPage;
       var promise = collection[options.direction]({fetch: false});
     },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cfdc7f98/app/addons/documents/templates/all_docs_number.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_number.html b/app/addons/documents/templates/all_docs_number.html
index e49f775..5148f96 100644
--- a/app/addons/documents/templates/all_docs_number.html
+++ b/app/addons/documents/templates/all_docs_number.html
@@ -23,7 +23,7 @@ the License.
   <% } %>
 </div>
 <div id="per-page">
-  <label id="per-page" class="drop-down inline">
+  <label for="select-per-page" class="drop-down inline">
     Per page:
     <select id="select-per-page" name="per-page" class="input-small">
       <option value="5">5</option>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cfdc7f98/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 847ed48..dacb937 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -230,7 +230,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions)
       this.pagination = options.pagination;
       _.bindAll(this);
 
-      this._perPage = options.perPageDefault || 20;
+      this._perPage = options.perPageDefault || FauxtonAPI.constants.MISC.DEFAULT_PAGE_SIZE;
       this.listenTo(this.collection, 'totalRows:decrement', this.render);
     },
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cfdc7f98/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 915533c..9225096 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -487,14 +487,12 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
 
     setCollection: function (collection) {
       this.collection = collection;
-      this.setDefaults();
       this.render();
     },
 
     getPerPage: function () {
       return this.perPage;
     }
-
   });
 
   // A super-simple replacement for window.confirm()


Mime
View raw message