Return-Path: 
 <commits-return-22995-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
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 2266418A90
	for <apmail-couchdb-commits-archive@www.apache.org>;
 Wed, 13 May 2015 09:09:44 +0000 (UTC)
Received: (qmail 72581 invoked by uid 500); 13 May 2015 09:09:44 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 72530 invoked by uid 500); 13 May 2015 09:09:44 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 72521 invoked by uid 99); 13 May 2015 09:09:43 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 09:09:43 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id B73E1E10F9; Wed, 13 May 2015 09:09:43 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: robertkowalski@apache.org
To: commits@couchdb.apache.org
Date: Wed, 13 May 2015 09:09:44 -0000
Message-Id: <fe19a568ba3041228d655320c2357dc4@git.apache.org>
In-Reply-To: <970de2119ca34e45bb2055f0858fcca0@git.apache.org>
References: <970de2119ca34e45bb2055f0858fcca0@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] fauxton commit: updated refs/heads/master to 2c9723a

Revert "DatabasePagination now supports passing custom URL prefix"

This reverts commit 860a808b49a1c536ee265a09ec573ace666630a6.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2c9723af
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2c9723af
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2c9723af

Branch: refs/heads/master
Commit: 2c9723af8cdafe414cefe7d4aa4493c306c9a8cf
Parents: 7f2c414
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Wed May 13 10:48:56 2015 +0200
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Wed May 13 10:48:56 2015 +0200

----------------------------------------------------------------------
 app/addons/databases/components.react.jsx           |  9 +--------
 app/addons/databases/tests/componentsSpec.react.jsx | 15 ---------------
 2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2c9723af/app/addons/databases/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/databases/components.react.jsx b/app/addons/databases/components.react.jsx
index a40c74b..0bf290c 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -269,11 +269,6 @@ define([
   });
 
   var DatabasePagination = React.createClass({
-    getDefaultProps: function () {
-      return {
-        linkPath: '_all_dbs'
-      };
-    },
 
     getStoreState: function () {
       return {
@@ -301,12 +296,10 @@ define([
     render: function () {
       var page = this.state.page;
       var total = this.props.total || this.state.databaseNames.length;
-      var urlPrefix = '#/' + this.props.linkPath + '?page=';
-
       return (
         <footer className="all-db-footer pagination-footer">
           <div id="database-pagination">
-            <ComponentsReact.Pagination page={page} total={total} urlPrefix={urlPrefix} />
+            <ComponentsReact.Pagination page={page} total={total} urlPrefix="#/_all_dbs?page=" />
           </div>
         </footer>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2c9723af/app/addons/databases/tests/componentsSpec.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/componentsSpec.react.jsx b/app/addons/databases/tests/componentsSpec.react.jsx
index cebb194..5a790a4 100644
--- a/app/addons/databases/tests/componentsSpec.react.jsx
+++ b/app/addons/databases/tests/componentsSpec.react.jsx
@@ -186,20 +186,5 @@ define([
 
   });
 
-  describe('DatabasePagination', function () {
-    it ('uses custom URL prefix on the navigation if passed through props', function () {
-      var container = document.createElement('div');
-      var pagination = TestUtils.renderIntoDocument(<Views.DatabasePagination linkPath="_custom_path" />, container);
-
-      var links = $(pagination.getDOMNode()).find("a");
-      assert.equal(links.length, 3, "pagination contains links");
-
-      links.each(function () {
-        assert.include(this.href, '_custom_path', 'link contains custom path');
-      });
-    });
-
-  });
-
 });