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/01/22 15:49:15 UTC
[33/50] [abbrv] couchdb commit: updated refs/heads/api-options to
bd721a5
Fauxton: Bug fixes
* Fix failing tests
* Fix pagination not showing correct number when docs less than limit
* Fix create new view failing with new design doc
* Add Fauxton logo for grunt couchserver
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b9d30b14
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b9d30b14
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b9d30b14
Branch: refs/heads/api-options
Commit: b9d30b1483f731358b8ace6dc052a2641132f16a
Parents: e5cac79
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jan 14 14:34:20 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Jan 14 14:34:20 2014 +0200
----------------------------------------------------------------------
.../documents/templates/index_row_docular.html | 2 +-
src/fauxton/app/addons/documents/views.js | 3 ++-
src/fauxton/app/addons/fauxton/components.js | 4 ++++
.../app/addons/permissions/tests/viewsSpec.js | 2 +-
src/fauxton/tasks/couchserver.js | 18 +++++++++++++++++-
5 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9d30b14/src/fauxton/app/addons/documents/templates/index_row_docular.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/templates/index_row_docular.html b/src/fauxton/app/addons/documents/templates/index_row_docular.html
index 446a031..e8973ad 100644
--- a/src/fauxton/app/addons/documents/templates/index_row_docular.html
+++ b/src/fauxton/app/addons/documents/templates/index_row_docular.html
@@ -19,7 +19,7 @@ the License.
<pre class="prettyprint"><%- doc.prettyJSON() %></pre>
<div class="btn-group">
- <a href="#<%= doc.url('app') %>" class="btn btn-small edits">Edit <%= doc.docType() %></a>
+ <a href="#<%= url %>" class="btn btn-small edits">Edit <%= doc.docType() %></a>
<% if (doc.isEditable()) { %>
<button href="#" class="btn btn-small btn-danger delete" title="Delete this document."><i class="icon icon-trash"></i></button>
<% } %>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9d30b14/src/fauxton/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js
index 0139eca..9902541 100644
--- a/src/fauxton/app/addons/documents/views.js
+++ b/src/fauxton/app/addons/documents/views.js
@@ -405,7 +405,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
serialize: function() {
return {
- doc: this.model
+ doc: this.model,
+ url: this.model.url('app')
};
}
});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9d30b14/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 a9f45ad..cda61c5 100644
--- a/src/fauxton/app/addons/fauxton/components.js
+++ b/src/fauxton/app/addons/fauxton/components.js
@@ -123,6 +123,10 @@ function(app, FauxtonAPI, ace) {
},
pageEnd: function () {
+ if (this.collection.length < this.pageLimit()) {
+ return this.collection.length;
+ }
+
return (this.previousParams.length * this.pageLimit()) + this.pageLimit();
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9d30b14/src/fauxton/app/addons/permissions/tests/viewsSpec.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/permissions/tests/viewsSpec.js b/src/fauxton/app/addons/permissions/tests/viewsSpec.js
index e5330c0..27abca4 100644
--- a/src/fauxton/app/addons/permissions/tests/viewsSpec.js
+++ b/src/fauxton/app/addons/permissions/tests/viewsSpec.js
@@ -25,7 +25,7 @@ define([
'names': ['_user'],
'roles': []
}
- }, {database: 'fakedb'});
+ }, {database: {id: 'fakedb', safeID: function () { return this.id; }}});
section = new Views.Permissions({
database: 'fakedb',
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9d30b14/src/fauxton/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index b9ff3ef..5ccbfe1 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -19,7 +19,8 @@ module.exports = function (grunt) {
http = require("http"),
httpProxy = require('http-proxy'),
send = require('send'),
- options = grunt.config('couchserver');
+ options = grunt.config('couchserver'),
+ _ = grunt.util._;
// Options
var dist_dir = options.dist || './dist/debug/',
@@ -98,6 +99,21 @@ module.exports = function (grunt) {
watch.stdout.pipe(process.stdout);
watch.stderr.pipe(process.stderr);
+ var logo = [
+ [""],
+ [" ______ _ "],
+ ["| ____| | | "],
+ ["| |__ __ _ _ _ __ __ | |_ ___ _ __ "],
+ ["| __| / _` | | | | | \\ \\/ / | __| / _ \\ | '_ \\ "],
+ ["| | | (_| | | |_| | > < | |_ | (_) | | | | |"],
+ ["|_| \\__,_| \\__,_| /_/\\_\\ \\__| \\___/ |_| |_|"],
+ [""]
+ ];
+
+ _.each(logo, function (line) {
+ console.log(line.toString());
+ });
+
log.writeln('Listening on ' + port);
});