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 2016/07/04 13:29:34 UTC
[4/7] fauxton commit: updated refs/heads/master to 73521f1
Breadcrumbs React port: cleanup
Clean up un-needed, not used link properties. They would link in
a breadcrumb system which supports links.
PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith <ga...@gmail.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/9c13fd47
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9c13fd47
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9c13fd47
Branch: refs/heads/master
Commit: 9c13fd47607cc0db3ccb3ae54e1e5a3855d99a43
Parents: 5be2610
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Tue Jun 21 11:52:18 2016 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Mon Jul 4 15:25:28 2016 +0200
----------------------------------------------------------------------
app/addons/activetasks/routes.js | 2 +-
app/addons/auth/routes.js | 6 +++---
app/addons/cluster/routes.js | 2 +-
app/addons/components/base.js | 3 ++-
app/addons/config/routes.js | 4 ++--
app/addons/databases/routes.js | 2 +-
app/addons/documentation/routes.js | 2 +-
app/addons/documents/routes-doc-editor.js | 6 +++---
app/addons/documents/shared-routes.js | 5 +----
app/addons/permissions/routes.js | 2 +-
app/addons/replication/route.js | 2 +-
app/addons/setup/route.js | 2 +-
app/addons/verifyinstall/routes.js | 2 +-
13 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/activetasks/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/activetasks/routes.js b/app/addons/activetasks/routes.js
index 3aed827..cee53e3 100644
--- a/app/addons/activetasks/routes.js
+++ b/app/addons/activetasks/routes.js
@@ -25,7 +25,7 @@ var ActiveTasksRouteObject = FauxtonAPI.RouteObject.extend({
'activetasks': 'showActiveTasks'
},
crumbs: [
- {'name': 'Active Tasks', 'link': 'activetasks'}
+ {'name': 'Active Tasks'}
],
apiUrl: function () {
var apiurl = window.location.origin + '/_active_tasks';
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/auth/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 2ba3931..2e42f4b 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -35,7 +35,7 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
},
login: function () {
- this.crumbs = [{ name: 'Log In to CouchDB', link: "#" }];
+ this.crumbs = [{ name: 'Log In to CouchDB' }];
this.setComponent('#dashboard-content', Components.LoginForm, { urlBack: app.getParams().urlback });
},
@@ -48,7 +48,7 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
createAdminForNode: function () {
ClusterActions.fetchNodes();
- this.crumbs = [{name: 'Create Admin', link: '#'}];
+ this.crumbs = [{ name: 'Create Admin' }];
this.setComponent('#dashboard-content', Components.CreateAdminForm, { loginAfter: true });
}
});
@@ -104,7 +104,7 @@ var UserRouteObject = FauxtonAPI.RouteObject.extend({
this.setComponent('#dashboard-content', Components.CreateAdminForm, { loginAfter: false });
},
- crumbs: [{name: 'User Management', link: '#'}]
+ crumbs: [{name: 'User Management'}]
});
Auth.RouteObjects = [AuthRouteObject, UserRouteObject];
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/cluster/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/cluster/routes.js b/app/addons/cluster/routes.js
index 7287c5a..b741b65 100644
--- a/app/addons/cluster/routes.js
+++ b/app/addons/cluster/routes.js
@@ -25,7 +25,7 @@ var ConfigDisabledRouteObject = FauxtonAPI.RouteObject.extend({
},
crumbs: [
- { name: 'Config disabled', link: '_config' }
+ { name: 'Config disabled' }
],
apiUrl: function () {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/components/base.js
----------------------------------------------------------------------
diff --git a/app/addons/components/base.js b/app/addons/components/base.js
index 7fa290e..1f6481d 100644
--- a/app/addons/components/base.js
+++ b/app/addons/components/base.js
@@ -11,7 +11,8 @@
// the License.
import "./assets/less/components.less";
-var Components = {};
+
+const Components = {};
Components.initialize = function () {};
export default Components;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/config/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
index a94b702..7d9f210 100644
--- a/app/addons/config/routes.js
+++ b/app/addons/config/routes.js
@@ -27,7 +27,7 @@ var ConfigDisabledRouteObject = FauxtonAPI.RouteObject.extend({
},
crumbs: [
- { name: 'Config disabled', link: '_config' }
+ { name: 'Config disabled' }
],
checkNodes: function () {
@@ -43,7 +43,7 @@ var ConfigPerNodeRouteObject = FauxtonAPI.RouteObject.extend({
selectedHeader: 'Config',
crumbs: [
- { name: 'Config', link: '_config' }
+ { name: 'Config' }
],
apiUrl: function () {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/databases/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index c872692..00e8b28 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -20,7 +20,7 @@ var AllDbsRouteObject = FauxtonAPI.RouteObject.extend({
layout: 'one_pane',
crumbs: [
- {"name": "Databases", "link": "/_all_dbs"}
+ {"name": "Databases"}
],
routes: {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/documentation/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documentation/routes.js b/app/addons/documentation/routes.js
index f09ebe8..c253645 100644
--- a/app/addons/documentation/routes.js
+++ b/app/addons/documentation/routes.js
@@ -22,7 +22,7 @@ var DocumentationRouteObject = FauxtonAPI.RouteObject.extend({
'documentation': 'documentation'
},
crumbs: [
- {'name': 'Documentation', 'link': '/documentation'}
+ {'name': 'Documentation'}
],
roles: ['fx_loggedIn'],
documentation: function () {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/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 59d91b6..c830ec9 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -45,7 +45,7 @@ const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
return [
{ type: 'back', link: previousPage },
- { name: this.docId + ' > Conflicts', link: '#' }
+ { name: this.docId + ' > Conflicts' }
];
},
@@ -94,14 +94,14 @@ const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
return [
{ type: 'back', link: previousPage },
- { name: this.docId, link: '#' }
+ { name: this.docId }
];
}
let previousPage = Helpers.getPreviousPageForDoc(this.database);
return [
{ type: 'back', link: previousPage },
- { name: 'New Document', link: '#' }
+ { name: 'New Document' }
];
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/documents/shared-routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/shared-routes.js b/app/addons/documents/shared-routes.js
index 5a29b97..5248c46 100644
--- a/app/addons/documents/shared-routes.js
+++ b/app/addons/documents/shared-routes.js
@@ -113,12 +113,9 @@ var BaseRoute = FauxtonAPI.RouteObject.extend({
},
getCrumbs: function (database) {
- var name = _.isObject(database) ? database.id : database,
- dbname = app.utils.safeURLName(name);
-
return [
{ "type": "back", "link": FauxtonAPI.urls('allDBs', 'app')},
- { "name": database.id, "link": FauxtonAPI.urls('allDocs', 'app', dbname, '?limit=' + Databases.DocLimit), className: "lookahead-tray-link" }
+ { "name": database.id, className: "lookahead-tray-link" }
];
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/permissions/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/permissions/routes.js b/app/addons/permissions/routes.js
index 044a09d..367525a 100644
--- a/app/addons/permissions/routes.js
+++ b/app/addons/permissions/routes.js
@@ -77,7 +77,7 @@ var PermissionsRouteObject = BaseRoute.extend({
crumbs: function () {
return [
{ name: this.database.id, link: Databases.databaseUrl(this.database)},
- { name: 'Permissions', link: '/permissions' }
+ { name: 'Permissions' }
];
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/replication/route.js
----------------------------------------------------------------------
diff --git a/app/addons/replication/route.js b/app/addons/replication/route.js
index 7d4aa60..858ad6f 100644
--- a/app/addons/replication/route.js
+++ b/app/addons/replication/route.js
@@ -25,7 +25,7 @@ var RepRouteObject = FauxtonAPI.RouteObject.extend({
return [this.replication.url(), this.replication.documentation];
},
crumbs: [
- { "name": 'Replicate changes from: ', 'link': 'replication' }
+ { "name": 'Replicate changes from: ' }
],
defaultView: function (dbname) {
var isAdmin = FauxtonAPI.session.isAdmin();
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/setup/route.js
----------------------------------------------------------------------
diff --git a/app/addons/setup/route.js b/app/addons/setup/route.js
index 49d8a8e..21c0ffc 100644
--- a/app/addons/setup/route.js
+++ b/app/addons/setup/route.js
@@ -29,7 +29,7 @@ var RouteObject = FauxtonAPI.RouteObject.extend({
},
crumbs: [
- {'name': 'Setup ' + app.i18n.en_US['couchdb-productname'], 'link': 'setup'}
+ { 'name': 'Setup ' + app.i18n.en_US['couchdb-productname'] }
],
apiUrl: function () {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/verifyinstall/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/verifyinstall/routes.js b/app/addons/verifyinstall/routes.js
index 94fb346..72c4690 100644
--- a/app/addons/verifyinstall/routes.js
+++ b/app/addons/verifyinstall/routes.js
@@ -29,7 +29,7 @@ var VerifyRouteObject = FauxtonAPI.RouteObject.extend({
this.setComponent('#dashboard-content', Components.VerifyInstallController);
},
- crumbs: [{name: 'Verify CouchDB Installation', link: '#'}]
+ crumbs: [{name: 'Verify CouchDB Installation'}]
});
VerifyInstall.RouteObjects = [VerifyRouteObject];