couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [2/3] fauxton commit: updated refs/heads/master to a0886ac
Date Fri, 27 Nov 2015 15:19:23 GMT
remove update seq

update_seq does not work with couchdb 2. the footer text also was
not visible because of a css issue for months.

PR: #585
PR-URL: https://github.com/apache/couchdb-fauxton/pull/585
Reviewed-By: Benjamin Keen <ben.keen@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/eeb6756f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/eeb6756f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/eeb6756f

Branch: refs/heads/master
Commit: eeb6756f029df018739e0b6b444f0ff3fab718b3
Parents: f917297
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Thu Nov 26 17:45:15 2015 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Fri Nov 27 16:19:08 2015 +0100

----------------------------------------------------------------------
 .../documents/pagination/pagination.react.jsx       |  8 --------
 .../pagination/tests/paginationStoreSpec.js         |  7 -------
 app/addons/documents/queryoptions/actions.js        |  6 ------
 app/addons/documents/queryoptions/actiontypes.js    |  1 -
 .../documents/queryoptions/queryoptions.react.jsx   |  7 -------
 app/addons/documents/queryoptions/stores.js         | 16 ----------------
 .../queryoptions/tests/queryoptions.storesSpec.js   |  2 --
 7 files changed, 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/pagination/pagination.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/pagination/pagination.react.jsx b/app/addons/documents/pagination/pagination.react.jsx
index 1280b58..0b34e62 100644
--- a/app/addons/documents/pagination/pagination.react.jsx
+++ b/app/addons/documents/pagination/pagination.react.jsx
@@ -116,7 +116,6 @@ define([
           totalRows: indexPaginationStore.getTotalRows(),
           pageStart: indexPaginationStore.getPageStart(),
           pageEnd: indexPaginationStore.getPageEnd(),
-          updateSeq: indexPaginationStore.getUpdateSeq(),
           perPage: indexPaginationStore.getPerPage()
         };
       },
@@ -145,12 +144,6 @@ define([
         return <p>Showing document {this.state.pageStart} - {this.state.pageEnd}</p>;
       },
 
-      updateSequence: function () {
-        if (this.state.updateSeq) {
-          return <span> Update Sequence: {this.state.updateSeq} </span>;
-        }
-      },
-
       perPageChange: function (perPage) {
         Actions.updatePerPage(perPage);
       },
@@ -160,7 +153,6 @@ define([
           <div>
             <div className="index-indicator">
               {this.pageNumber()}
-              {this.updateSequence()}
             </div>
             <PerPageSelector perPageChange={this.perPageChange} perPage={this.state.perPage}
/>
           </div>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/pagination/tests/paginationStoreSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/pagination/tests/paginationStoreSpec.js b/app/addons/documents/pagination/tests/paginationStoreSpec.js
index f278c3d..7719372 100644
--- a/app/addons/documents/pagination/tests/paginationStoreSpec.js
+++ b/app/addons/documents/pagination/tests/paginationStoreSpec.js
@@ -41,7 +41,6 @@ define([
             safeID: function () { return '1';}
           }
         });
-        collection.updateSeq = function () { return 'updateSeq';};
         store.reset();
       });
 
@@ -49,12 +48,6 @@ define([
         store.newPagination(collection);
         assert.equal(store.getTotalRows(), 2);
       });
-
-      it('sets updateSeq', function () {
-        store.newPagination(collection);
-        assert.equal(store.getUpdateSeq(), 'updateSeq');
-      });
-
     });
 
     describe('canShowPrevious', function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/queryoptions/actions.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/queryoptions/actions.js b/app/addons/documents/queryoptions/actions.js
index 861214a..91abd64 100644
--- a/app/addons/documents/queryoptions/actions.js
+++ b/app/addons/documents/queryoptions/actions.js
@@ -38,12 +38,6 @@ function (app, FauxtonAPI, ActionTypes, Stores) {
       });
     },
 
-    toggleUpdateSeq: function () {
-      FauxtonAPI.dispatch({
-        type: ActionTypes.QUERY_TOGGLE_UPDATE_SEQ
-      });
-    },
-
     toggleDescending: function () {
       FauxtonAPI.dispatch({
         type: ActionTypes.QUERY_TOGGLE_DESCENDING

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/queryoptions/actiontypes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/queryoptions/actiontypes.js b/app/addons/documents/queryoptions/actiontypes.js
index 22545e5..b709bc2 100644
--- a/app/addons/documents/queryoptions/actiontypes.js
+++ b/app/addons/documents/queryoptions/actiontypes.js
@@ -17,7 +17,6 @@ define([], function () {
     QUERY_TOGGLE_BETWEEN_KEYS: 'QUERY_TOGGLE_BETWEEN_KEYS',
     QUERY_UPDATE_BETWEEN_KEYS: 'QUERY_UPDATE_BETWEEN_KEYS',
     QUERY_UPDATE_BY_KEYS: 'QUERY_UPDATE_BY_KEYS',
-    QUERY_TOGGLE_UPDATE_SEQ: 'QUERY_TOGGLE_UPDATE_SEQ',
     QUERY_TOGGLE_DESCENDING: 'QUERY_TOGGLE_DESCENDING',
     QUERY_TOGGLE_REDUCE: 'QUERY_TOGGLE_REDUCE',
     QUERY_UPDATE_SKIP: 'QUERY_UPDATE_SKIP',

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/queryoptions/queryoptions.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/queryoptions/queryoptions.react.jsx b/app/addons/documents/queryoptions/queryoptions.react.jsx
index 1f4aaf9..c2ac918 100644
--- a/app/addons/documents/queryoptions/queryoptions.react.jsx
+++ b/app/addons/documents/queryoptions/queryoptions.react.jsx
@@ -237,10 +237,6 @@ A key value is the first parameter emitted in a map function. For example
emit("
           <div className="add-on additionalParams">Additional Parameters</div>
           <div className="row-fluid fieldsets">
             {this.showStale()}
-            <div className="checkbox inline">
-              <input id="qoUpdateSeq" type="checkbox" onChange={this.props.toggleUpdateSeq}
checked={this.props.updateSeq} />
-              <label htmlFor="qoUpdateSeq">Update Sequence</label>
-            </div>
             <div className="dropdown inline">
               <label className="drop-down">
                 Limit
@@ -302,7 +298,6 @@ A key value is the first parameter emitted in a map function. For example
emit("
         showByKeys: store.showByKeys(),
         betweenKeys: store.betweenKeys(),
         byKeys: store.byKeys(),
-        updateSeq: store.updateSeq(),
         descending: store.descending(),
         skip: store.skip(),
         limit: store.limit(),
@@ -372,8 +367,6 @@ A key value is the first parameter emitted in a map function. For example
emit("
                 updateByKeys={Actions.updateByKeys}
                />
               <AdditionalParams
-                updateSeq={this.state.updateSeq}
-                toggleUpdateSeq={Actions.toggleUpdateSeq}
                 descending={this.state.descending}
                 toggleDescending={Actions.toggleDescending}
                 skip={this.state.skip}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/queryoptions/stores.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/queryoptions/stores.js b/app/addons/documents/queryoptions/stores.js
index f09b3c8..656cc97 100644
--- a/app/addons/documents/queryoptions/stores.js
+++ b/app/addons/documents/queryoptions/stores.js
@@ -35,7 +35,6 @@ function (app, FauxtonAPI, ActionTypes) {
       };
 
       this._byKeys = '';
-      this._updateSeq = false;
       this._descending = false;
       this._skip = '';
       this._limit = "none";
@@ -98,10 +97,6 @@ function (app, FauxtonAPI, ActionTypes) {
       return this._includeDocs;
     },
 
-    updateSeq: function () {
-      return this._updateSeq;
-    },
-
     descending: function () {
       return this._descending;
     },
@@ -164,10 +159,6 @@ function (app, FauxtonAPI, ActionTypes) {
         this._showByKeys = true;
       }
 
-      if (params.update_seq) {
-        this._updateSeq = params.update_seq;
-      }
-
       if (params.limit && params.limit !== 'none') {
         this._limit = params.limit;
       }
@@ -210,10 +201,6 @@ function (app, FauxtonAPI, ActionTypes) {
         params.keys = this._byKeys.replace(/\r?\n/g, '');
       }
 
-      if (this._updateSeq) {
-        params.update_seq = this._updateSeq;
-      }
-
       if (this._limit !== 'none') {
         params.limit = parseInt(this._limit, 10);
       }
@@ -247,9 +234,6 @@ function (app, FauxtonAPI, ActionTypes) {
         case ActionTypes.QUERY_TOGGLE_INCLUDE_DOCS:
           this._includeDocs = !this._includeDocs;
         break;
-        case ActionTypes.QUERY_TOGGLE_UPDATE_SEQ:
-          this._updateSeq = !this._updateSeq;
-        break;
         case ActionTypes.QUERY_TOGGLE_DESCENDING:
           this._descending = !this._descending;
         break;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeb6756f/app/addons/documents/queryoptions/tests/queryoptions.storesSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/queryoptions/tests/queryoptions.storesSpec.js b/app/addons/documents/queryoptions/tests/queryoptions.storesSpec.js
index 2a884ab..a2dadf9 100644
--- a/app/addons/documents/queryoptions/tests/queryoptions.storesSpec.js
+++ b/app/addons/documents/queryoptions/tests/queryoptions.storesSpec.js
@@ -98,7 +98,6 @@ define([
           include_docs: true,
           limit: 10,
           skip: 5,
-          update_seq: true,
           descending: true
         });
 
@@ -106,7 +105,6 @@ define([
         assert.ok(store.descending());
         assert.equal(store.limit(), 10);
         assert.equal(store.skip(), 5);
-        assert.equal(store.updateSeq(), 1);
       });
 
       it('sets between keys', function () {


Mime
View raw message