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:21 UTC
[1/4] fauxton commit: updated refs/heads/master to 7eca51c
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 1e0f4de0c -> 7eca51c37
New Documents Pagination
Initial work by
deathbearbrown@gmail.com and Jenn Schiffer jenn@pancaketheorem.com.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0d5f0e7d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0d5f0e7d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0d5f0e7d
Branch: refs/heads/master
Commit: 0d5f0e7dcc2bc002dfd99f3b95bcc5119a9d6635
Parents: 1e0f4de
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Sep 2 17:04:04 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Sep 2 17:18:35 2014 +0200
----------------------------------------------------------------------
.../documents/templates/all_docs_list.html | 7 +++++--
.../documents/templates/all_docs_number.html | 5 +++--
app/addons/documents/views.js | 1 +
app/addons/fauxton/components.js | 6 ++++++
.../fauxton/templates/index_pagination.html | 16 ++++++---------
assets/index.underscore | 4 ----
assets/less/fauxton.less | 21 +++++++++++++++++++-
7 files changed, 41 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/app/addons/documents/templates/all_docs_list.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_list.html b/app/addons/documents/templates/all_docs_list.html
index a643427..8db7bbe 100644
--- a/app/addons/documents/templates/all_docs_list.html
+++ b/app/addons/documents/templates/all_docs_list.html
@@ -28,7 +28,6 @@ the License.
<% } %>
<p>
- <div id="item-numbers"> </div>
<table class="all-docs table table-striped table-condensed">
<tbody></tbody>
</table>
@@ -40,5 +39,9 @@ the License.
</p>
</div>
<% } %>
- <div id="documents-pagination"></div>
+
+ <footer class="index-pagination pagination-footer window-resizeable<%=resizeLayout%>">
+ <div id="item-numbers"> </div>
+ <div id="documents-pagination"></div>
+ </footer>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/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 0461a4b..49d6898 100644
--- a/app/addons/documents/templates/all_docs_number.html
+++ b/app/addons/documents/templates/all_docs_number.html
@@ -12,9 +12,10 @@ License for the specific language governing permissions and limitations under
the License.
-->
<% if (totalRows === "unknown" || totalRows === 0){ %>
-Showing 0 documents. <a href="#/database/<%=database%>/new"> Create your first document.</a>
+<p>Showing 0 documents.</p>
<% } else { %>
-Showing <%=pageStart%> - <%= pageEnd %>
+
+<p>Showing <%=pageStart%> - <%= pageEnd %></p>
<%}%>
<% if (updateSeq) { %>
-- Update Sequence: <%= updateSeq %>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index c6a6bf9..22c324f 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -578,6 +578,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
serialize: function() {
return {
viewList: this.viewList,
+ resizeLayout: this.viewList ? "-half":"",
expandDocs: this.expandDocs,
endOfResults: !this.pagination.canShowNextfn()
};
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 2087394..74f6c74 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -212,6 +212,8 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
Components.IndexPagination = FauxtonAPI.View.extend({
+ className: "pagination pagination-centered",
+ tagName: 'ul',
template: "addons/fauxton/templates/index_pagination",
events: {
"click a": 'scrollTo',
@@ -256,6 +258,10 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
return this.collection.hasNext();
},
+ afterRender: function () {
+ app.resizeColumns.onResizeHandler();
+ },
+
previousClicked: function (event) {
event.preventDefault();
event.stopPropagation();
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/app/addons/fauxton/templates/index_pagination.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/index_pagination.html b/app/addons/fauxton/templates/index_pagination.html
index f445377..92d6683 100644
--- a/app/addons/fauxton/templates/index_pagination.html
+++ b/app/addons/fauxton/templates/index_pagination.html
@@ -12,13 +12,9 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<div class="pagination pagination-centered">
- <ul>
- <li <% if (!canShowPreviousfn()) {%> class="disabled" <% } %>>
- <a id="previous" href="#"> Previous </a>
- </li>
- <li <% if (!canShowNextfn()) {%> class="disabled" <% } %>>
- <a id="next" href="#"> Next </a></li>
- </ul>
-</div>
-
+<li <% if (!canShowPreviousfn()) {%> class="disabled" <% } %>>
+ <a id="previous" class="icon fonticon-left-open" href="#"></a>
+</li>
+<li <% if (!canShowNextfn()) {%> class="disabled" <% } %>>
+ <a id="next" class="icon fonticon-right-open" href="#"></a>
+</li>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/assets/index.underscore
----------------------------------------------------------------------
diff --git a/assets/index.underscore b/assets/index.underscore
index 396cce3..6a887b5 100644
--- a/assets/index.underscore
+++ b/assets/index.underscore
@@ -35,10 +35,6 @@
<div role="main" id="main">
<div id="global-notifications" class="container errors-container"></div>
<div id="app-container"></div>
-
- <footer>
- <div id="footer-content"></div>
- </footer>
</div>
<!-- Application source. -->
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0d5f0e7d/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 86b2147..1ae9b15 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -999,7 +999,7 @@ div.add-dropdown {
}
.one-pane &{
//margin-top:60px;
- //padding-bottom:60px;
+ padding-bottom:25px;
}
.with-sidebar &{
.left-shadow-border;
@@ -1304,3 +1304,22 @@ footer.pagination-footer {
}
}
+footer.index-pagination {
+ margin-left: -20px;
+}
+
+#item-numbers{
+ p {
+ margin: 20px;
+ font-size: 14px;
+ }
+}
+
+div#per-page {
+ position: absolute;
+ right: 86px;
+ top: 2px;
+ #select-per-page {
+ margin-top: 10px;
+ }
+}
[2/4] fauxton commit: updated refs/heads/master to 7eca51c
Posted by ga...@apache.org.
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();
[4/4] fauxton commit: updated refs/heads/master to 7eca51c
Posted by ga...@apache.org.
Bug fixes on creating/editing views
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7eca51c3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7eca51c3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7eca51c3
Branch: refs/heads/master
Commit: 7eca51c37b8053037422a06152ea6fabc1b30b7b
Parents: feb8907
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Sep 3 15:19:12 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Sep 3 16:05:07 2014 +0200
----------------------------------------------------------------------
app/addons/documents/routes-documents.js | 11 ++++++-----
app/addons/documents/views-index.js | 3 +--
app/addons/documents/views-sidebar.js | 19 ++++++++++++++-----
app/addons/documents/views.js | 7 ++++---
app/addons/fauxton/tests/paginateSpec.js | 4 ++++
5 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7eca51c3/app/addons/documents/routes-documents.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-documents.js b/app/addons/documents/routes-documents.js
index 9c466a0..534889c 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -344,11 +344,9 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
}));
this.sidebar.setSelectedTab('new-view');
- this.crumbs = function () {
- return [
- {"name": this.database.id, "link": Databases.databaseUrl(this.database)},
- ];
- };
+
+ //this.rightHeader.updateApiUrl([this.indexedDocs.urlRef("apiurl", urlParams), "docs"]);
+ this.leftheader.forceRender();
},
updateAllDocsFromView: function (event) {
@@ -407,18 +405,21 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
this.documentsView.forceRender();
this.documentsView.collection.pageSizeReset(perPage, {fetch: false});
this.setDocPerPageLimit(perPage);
+ this.leftheader.forceRender();
},
paginate: function (options) {
var collection = this.documentsView.collection;
this.documentsView.forceRender();
+ this.leftheader.forceRender();
collection.paging.pageSize = options.perPage;
var promise = collection[options.direction]({fetch: false});
},
reloadDesignDocs: function (event) {
this.sidebar.forceRender();
+ this.leftheader.forceRender();
if (event && event.selectedTab) {
this.sidebar.setSelectedTab(event.selectedTab);
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7eca51c3/app/addons/documents/views-index.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-index.js b/app/addons/documents/views-index.js
index d0ed8ed..a21dc61 100644
--- a/app/addons/documents/views-index.js
+++ b/app/addons/documents/views-index.js
@@ -168,7 +168,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
that.mapEditor.editSaved();
that.reduceEditor && that.reduceEditor.editSaved();
-
FauxtonAPI.addNotification({
msg: "View has been saved.",
type: "success",
@@ -177,7 +176,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
});
if (that.newView || viewNameChange) {
- var fragment = '/database/' + that.database.safeID() +'/' + ddoc.safeID() + '/_view/' + app.utils.safeURLName(viewName);
+ var fragment = '/database/' + that.database.safeID() +'/' + ddoc.safeID() + '/_views/' + app.utils.safeURLName(viewName);
FauxtonAPI.navigate(fragment, {trigger: false});
that.newView = false;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7eca51c3/app/addons/documents/views-sidebar.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-sidebar.js b/app/addons/documents/views-sidebar.js
index 9f8c0ee..34212ef 100644
--- a/app/addons/documents/views-sidebar.js
+++ b/app/addons/documents/views-sidebar.js
@@ -37,6 +37,8 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
this.ddocID = options.ddocInfo.id;
this.currView = options.ddocInfo.currView;
}
+
+ this.designDocList = [];
},
showDeleteDatabaseModal: function(event){
this.deleteDBModal.showModal();
@@ -105,12 +107,18 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
links: newLinks,
}));
+ _.each(this.designDocList, function (view) { view.remove();});
+ this.designDocList = [];
+
this.collection.each(function(design) {
if (design.has('doc')){
- this.insertView(new Views.DdocSidenav({
+ design.collection = this.collection;
+ var view = this.insertView(new Views.DdocSidenav({
model: design,
collection: this.collection
}));
+
+ this.designDocList.push(view);
}
},this);
},
@@ -151,15 +159,16 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
toggleArrow: function(e){
this.$(e.currentTarget).toggleClass("down");
},
- buildIndexList: function(collection, info){
+ buildIndexList: function(designDocs, info){
var design = this.model.id.replace(/^_design\//,"");
+ var databaseId = this.model.database.id;
this.insertView(".accordion-body", new Views.IndexItem({
selector: info.selector,
ddoc: design,
- collection: collection[info.selector],
+ collection: designDocs[info.selector],
name: info.name,
- database: this.model.collection.database.id
+ database: databaseId
}));
},
@@ -170,7 +179,7 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
designDoc: ddocName,
ddoc_clean: app.utils.removeSpecialCharacters(ddocName),
ddoc_encoded: app.utils.safeURLName(ddocName),
- database_encoded: app.utils.safeURLName(this.model.collection.database.id),
+ database_encoded: app.utils.safeURLName(this.model.database.id),
};
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7eca51c3/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 7f44f70..01accb6 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -193,8 +193,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
}
});
-
-
Views.Document = FauxtonAPI.View.extend({
template: "addons/documents/templates/all_docs_item",
tagName: "tr",
@@ -578,7 +576,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
serialize: function() {
return {
viewList: this.viewList,
- resizeLayout: this.viewList ? "-half":"",
+ resizeLayout: "", //this.viewList ? "-half":"",
expandDocs: this.expandDocs,
endOfResults: !this.pagination.canShowNextfn()
};
@@ -668,6 +666,9 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
setCollection: function (collection) {
this.collection = collection;
+ if (!this.pagination) {
+ this.addPagination();
+ }
this.pagination.setCollection(collection);
this.allDocsNumber.setCollection(collection);
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7eca51c3/app/addons/fauxton/tests/paginateSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/paginateSpec.js b/app/addons/fauxton/tests/paginateSpec.js
index f97b255..460c924 100644
--- a/app/addons/fauxton/tests/paginateSpec.js
+++ b/app/addons/fauxton/tests/paginateSpec.js
@@ -22,6 +22,10 @@ define([
describe('IndexPaginate', function () {
var viewSandbox, paginate, collection, navigateMock;
+ app.resizeColumns = {
+ onResizeHandler: function () {}
+ };
+
beforeEach(function (done) {
collection = new Models.IndexCollection([{
id:'myId1',
[3/4] fauxton commit: updated refs/heads/master to 7eca51c
Posted by ga...@apache.org.
Set useRAF to false, its causing too many issues for now
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/feb89074
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/feb89074
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/feb89074
Branch: refs/heads/master
Commit: feb8907497748321a54fb6b1e8794faa581c65a3
Parents: 0882d3b
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Sep 3 15:18:51 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Sep 3 15:18:51 2014 +0200
----------------------------------------------------------------------
app/core/base.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/feb89074/app/core/base.js
----------------------------------------------------------------------
diff --git a/app/core/base.js b/app/core/base.js
index 3d51e06..61da5e4 100644
--- a/app/core/base.js
+++ b/app/core/base.js
@@ -62,7 +62,7 @@ function(Backbone, LayoutManager) {
manage: true,
disableLoader: false,
- useRAF: true,
+ useRAF: false,
forceRender: function () {
this.hasRendered = false;