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/09/03 16:05:22 UTC
[2/4] fauxton commit: updated refs/heads/master to 7eca51c
Fix COUCHDB-2314
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0882d3b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0882d3b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0882d3b8
Branch: refs/heads/master
Commit: 0882d3b8f10b90b15547878d858d2e90d5dc114a
Parents: 0d5f0e7
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Sep 3 12:56:56 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Sep 3 12:57:28 2014 +0200
----------------------------------------------------------------------
app/addons/documents/resources.js | 1 -
app/addons/documents/routes-documents.js | 1 -
app/addons/documents/templates/all_docs_number.html | 4 ++--
app/addons/documents/views.js | 8 ++++++++
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0882d3b8/app/addons/documents/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/resources.js b/app/addons/documents/resources.js
index e1df569..250e302 100644
--- a/app/addons/documents/resources.js
+++ b/app/addons/documents/resources.js
@@ -44,7 +44,6 @@ function(app, FauxtonAPI, PagingCollection) {
};
})();
-
Documents.Doc = FauxtonAPI.Model.extend({
idAttribute: "_id",
documentation: function(){
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0882d3b8/app/addons/documents/routes-documents.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-documents.js b/app/addons/documents/routes-documents.js
index 9ab69b3..9c466a0 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -44,7 +44,6 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
{"name": "_changes", "link": "/_changes"}
];
}
-
};
var DocumentsRouteObject = FauxtonAPI.RouteObject.extend({
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0882d3b8/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 49d6898..09f73f0 100644
--- a/app/addons/documents/templates/all_docs_number.html
+++ b/app/addons/documents/templates/all_docs_number.html
@@ -15,10 +15,10 @@ the License.
<p>Showing 0 documents.</p>
<% } else { %>
-<p>Showing <%=pageStart%> - <%= pageEnd %></p>
+<p>Showing <%-pageStart%> - <%- pageEnd %></p>
<%}%>
<% if (updateSeq) { %>
--- Update Sequence: <%= updateSeq %>
+-- Update Sequence: <%- updateSeq %>
<% } %>
<div id="per-page">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0882d3b8/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 22c324f..7f44f70 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -624,6 +624,13 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
_.each(this.rows, function (row) {row.remove();});
},
+ removeNestedViews: function () {
+ _.each(this.rows, function (row) {
+ row.remove();
+ });
+ this.rows = {};
+ },
+
beforeRender: function() {
var docs;
@@ -643,6 +650,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
}
this.setView('#item-numbers', this.allDocsNumber);
+ this.removeNestedViews();
docs = this.expandDocs ? this.collection : this.collection.simple();