You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/09/24 21:41:43 UTC
fauxton commit: updated refs/heads/master to abc9024
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 1ace0604d -> abc9024b9
Added missing API link to header of edit doc page
closes COUCHDB-2332
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/abc9024b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/abc9024b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/abc9024b
Branch: refs/heads/master
Commit: abc9024b9c8dd4b314252831c9cc7254eb300b1e
Parents: 1ace060
Author: Benjamin Keen <be...@gmail.com>
Authored: Thu Sep 18 10:51:17 2014 -0700
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Wed Sep 24 21:40:42 2014 +0200
----------------------------------------------------------------------
app/addons/documents/routes-doc-editor.js | 8 ++++----
app/addons/fauxton/base.js | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/abc9024b/app/addons/documents/routes-doc-editor.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-doc-editor.js b/app/addons/documents/routes-doc-editor.js
index 2e60950..a4fa44c 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -19,7 +19,7 @@ define([
//views
"addons/documents/views",
"addons/documents/views-doceditor",
- "addons/databases/base",
+ "addons/databases/base"
],
function(app, FauxtonAPI, Documents, DocEditor, Databases) {
@@ -28,6 +28,7 @@ function(app, FauxtonAPI, Documents, DocEditor, Databases) {
layout: "one_pane",
disableLoader: true,
selectedHeader: "Databases",
+
initialize: function(route, masterLayout, options) {
var databaseName = options[0];
this.docID = options[1]||'new';
@@ -104,8 +105,8 @@ function(app, FauxtonAPI, Documents, DocEditor, Databases) {
this.doc = new Documents.NewDoc(null,{
database: this.database
});
-
},
+
crumbs: function() {
return [
{"name": this.database.id, "link": Databases.databaseUrl(this.database)},
@@ -115,8 +116,7 @@ function(app, FauxtonAPI, Documents, DocEditor, Databases) {
routes: {
"database/:database/new": "code_editor"
},
- selectedHeader: "Databases",
-
+ selectedHeader: "Databases"
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/abc9024b/app/addons/fauxton/base.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/base.js b/app/addons/fauxton/base.js
index 0818af7..3bb5cdb 100644
--- a/app/addons/fauxton/base.js
+++ b/app/addons/fauxton/base.js
@@ -85,6 +85,7 @@ function(app, FauxtonAPI, resizeColumns, Components, ZeroClipboard) {
FauxtonAPI.RouteObject.on('renderComplete', function (routeObject) {
var masterLayout = FauxtonAPI.masterLayout;
if (routeObject.get('apiUrl')){
+ masterLayout.apiBar.show();
masterLayout.apiBar.update(routeObject.get('apiUrl'));
} else {
masterLayout.apiBar.hide();