Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A5E4C10E52 for ; Tue, 2 Jul 2013 08:47:04 +0000 (UTC) Received: (qmail 40708 invoked by uid 500); 2 Jul 2013 08:46:54 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 40449 invoked by uid 500); 2 Jul 2013 08:46:51 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 39596 invoked by uid 99); 2 Jul 2013 08:46:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 08:46:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2376853576; Tue, 2 Jul 2013 08:46:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Tue, 02 Jul 2013 08:46:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/19] git commit: updated refs/heads/1828-duplicate-doc to 7a7db42 Spacing nits Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/85f3c8ed Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/85f3c8ed Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/85f3c8ed Branch: refs/heads/1828-duplicate-doc Commit: 85f3c8ed5a62ea48dd27c7f078ced6d3aa2c4dca Parents: dfd39d5 Author: Russell Branca Authored: Thu May 30 11:02:42 2013 -0700 Committer: Russell Branca Committed: Mon Jun 17 16:19:11 2013 -0700 ---------------------------------------------------------------------- src/fauxton/app/modules/databases/routes.js | 8 ++++---- src/fauxton/app/router.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/85f3c8ed/src/fauxton/app/modules/databases/routes.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/modules/databases/routes.js b/src/fauxton/app/modules/databases/routes.js index 7b45413..5772ee8 100644 --- a/src/fauxton/app/modules/databases/routes.js +++ b/src/fauxton/app/modules/databases/routes.js @@ -32,7 +32,7 @@ function(app, FauxtonAPI, Databases, Views) { routes: { "": "allDatabases", - "index.html": "allDatabases", + "index.html": "allDatabases", "_all_dbs(:params)": "allDatabases" }, @@ -45,7 +45,7 @@ function(app, FauxtonAPI, Databases, Views) { this.deferred = FauxtonAPI.Deferred(); this.sidebarView = this.setView("#sidebar-content", new Views.Sidebar({ - collection: this.databases + collection: this.databases })); }, @@ -54,7 +54,7 @@ function(app, FauxtonAPI, Databases, Views) { dbPage = params.page; this.databasesView = this.setView("#dashboard-content", new Views.List({ - collection: this.databases + collection: this.databases })); this.databasesView.setPage(dbPage); @@ -75,7 +75,7 @@ function(app, FauxtonAPI, Databases, Views) { return [deferred]; } }); - + Databases.RouteObjects = [AllDbsRouteObject]; return Databases; http://git-wip-us.apache.org/repos/asf/couchdb/blob/85f3c8ed/src/fauxton/app/router.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/router.js b/src/fauxton/app/router.js index fea1b32..e90e6e7 100644 --- a/src/fauxton/app/router.js +++ b/src/fauxton/app/router.js @@ -71,7 +71,7 @@ function(req, app, Initialize, FauxtonAPI, Fauxton, Layout, Databases, Documents authPromise.then(function () { routeObject.routeCallback(route, args); routeObject.renderWith(route, masterLayout, args); - }, function () { + }, function () { FauxtonAPI.auth.authDeniedCb(); });