You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/12/16 21:03:57 UTC
[37/50] git commit: updated refs/heads/1744-single-config-file to
1c344a9
Fauxton: Improvements and fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0f373588
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0f373588
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0f373588
Branch: refs/heads/1744-single-config-file
Commit: 0f3735887b80d6e057abade2703c99f81cd92ca5
Parents: 6f5580a
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Dec 10 17:41:20 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Dec 10 17:42:58 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/modules/databases/views.js | 1 -
src/fauxton/app/modules/documents/views.js | 4 ++--
src/fauxton/app/templates/documents/sidebar.html | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0f373588/src/fauxton/app/modules/databases/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/databases/views.js b/src/fauxton/app/modules/databases/views.js
index 5d46cd3..7d59ac4 100644
--- a/src/fauxton/app/modules/databases/views.js
+++ b/src/fauxton/app/modules/databases/views.js
@@ -111,7 +111,6 @@ function(app, Components, FauxtonAPI, Databases) {
dbLimit: this.dbLimit,
el: "input.search-query",
onUpdate: function (item) {
- console.log('boom', item);
that.switchDatabase(null, item);
}
});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0f373588/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index b621e50..83f8e55 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -976,7 +976,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
if (typeof(options.hasReduce) === 'undefined') {
this.hasReduce = true;
- console.log('set true');
} else {
this.hasReduce = options.hasReduce;
}
@@ -1126,6 +1125,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
this.ddocName = options.ddocName;
this.database = options.database;
this.listenTo(this.collection, 'add', this.ddocAdded);
+ this.DocModel = options.DocModel || Documents.Doc;
},
ddocAdded: function (ddoc) {
@@ -1159,7 +1159,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
views: {},
language: "javascript"
};
- return new Documents.Doc(doc, {database: this.database});
+ return new this.DocModel(doc, {database: this.database});
} else {
var ddocName = this.$('#ddoc').val();
return this.collection.find(function (ddoc) {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0f373588/src/fauxton/app/templates/documents/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index 4becf93..8fccc09 100644
--- a/src/fauxton/app/templates/documents/sidebar.html
+++ b/src/fauxton/app/templates/documents/sidebar.html
@@ -63,5 +63,6 @@ the License.
<li><a id="new-view" href="#<%= database.url('app') %>/new_view" class="new"><i class="icon-plus"></i> New</a></li>
<% } %>
</ul>
+ <div id="extension-navs"></div>
</nav>
</div>