Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 799cfd33b -> 5aeb8c43e
Breadcrumbs React port: remove jump-to-db
PR: #739
PR-URL: https://github.com/apache/couchdb-fauxton/pull/739
Reviewed-By: garren smith
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5aeb8c43
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5aeb8c43
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5aeb8c43
Branch: refs/heads/master
Commit: 5aeb8c43eed5195e7abce2cb9509120df601e517
Parents: 799cfd3
Author: Robert Kowalski
Authored: Wed Jun 29 10:28:47 2016 +0200
Committer: Robert Kowalski
Committed: Fri Aug 12 16:56:15 2016 +0200
--
app/addons/documents/routes-documents.js| 7 --
app/addons/documents/shared-routes.js | 26 +---
.../documents/tests/nightwatch/lookaheadTray.js | 28 -
.../switchDatabaseViaLookaheadTray.js | 42 ---
app/addons/fauxton/components.js| 126 ---
app/addons/fauxton/templates/header_left.html | 3 -
.../fauxton/templates/lookahead_tray.html | 16 ---
app/addons/permissions/routes.js| 16 ---
assets/less/trays.less | 99 ---
9 files changed, 1 insertion(+), 362 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5aeb8c43/app/addons/documents/routes-documents.js
--
diff --git a/app/addons/documents/routes-documents.js
b/app/addons/documents/routes-documents.js
index 7858177..469f99f 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -53,7 +53,6 @@ var DocumentsRouteObject = BaseRoute.extend({
initialize: function (route, masterLayout, options) {
this.initViews(options[0]);
-this.listenToLookaheadTray();
},
establish: function () {
@@ -191,12 +190,6 @@ var DocumentsRouteObject = BaseRoute.extend({
this.apiUrl = function () {
return [FauxtonAPI.urls('changes', 'apiurl', this.database.id, ''),
this.database.documentation()];
};
- },
-
- cleanup: function () {
-// we're no longer interested in listening to the lookahead tray event on
this route object
-this.stopListening(FauxtonAPI.Events, 'lookaheadTray:update',
this.onSelectDatabase);
-FauxtonAPI.RouteObject.prototype.cleanup.apply(this);
}
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5aeb8c43/app/addons/documents/shared-routes.js
--
diff --git a/app/addons/documents/shared-routes.js
b/app/addons/documents/shared-routes.js
index 5248c46..e96b8af 100644
--- a/app/addons/documents/shared-routes.js
+++ b/app/addons/documents/shared-routes.js
@@ -44,24 +44,6 @@ var BaseRoute = FauxtonAPI.RouteObject.extend({
});
},
- onSelectDatabase: function (dbName) {
-this.cleanup();
-this.initViews(dbName);
-
-var url = FauxtonAPI.urls('allDocs', 'app',
app.utils.safeURLName(dbName), '');
-FauxtonAPI.navigate(url, {
- trigger: true
-});
-
-// we need to start listening again because cleanup() removed the
listener, but in this case
-// initialize() doesn't fire to re-set up the listener
-this.listenToLookaheadTray();
- },
-
- listenToLookaheadTray: function () {
-this.listenTo(FauxtonAPI.Events, 'lookaheadTray:update',
this.onSelectDatabase);
- },
-
getAllDatabases: function () {
return new Databases.List(); //getAllDatabases() can be overwritten
instead of hard coded into initViews
},
@@ -89,13 +71,7 @@ var BaseRoute = FauxtonAPI.RouteObject.extend({
addLeftHeader: function () {
this.leftheader = this.setView('#breadcrumbs', new Components.LeftHeader({
databaseName: this.database.safeID(),
- crumbs: this.getCrumbs(this.database),
- lookaheadTrayOptions: {
-databaseCollection: this.allDatabases,
-toggleEventName: 'lookaheadTray:toggle',
-onUpdateEventName: 'lookaheadTray:update',
-placeholder: 'Enter database name'
- }
+ crumbs: this.getCrumbs(this.database)
}));
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5aeb8c43/app/addons/documents/tests/nightwatch/lookaheadTray.js
--
diff --git a/app/addons/documents/tests/nightwatch/lookaheadTray.js
b/app/addons/documents/tests/nightwatch/lookaheadTray.js
deleted file mode 100644
index 08da65b..000
--- a/app/addons/documents/tests/nightwatch/lookaheadTray.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except i
