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/02/04 12:35:30 UTC
[1/2] fauxton commit: updated refs/heads/master to 5f07e86
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 478a3b3ef -> 5f07e86c3
styled select: remove typecheck for
it is sometimes an array and sometimes an object
PR: #639
PR-URL: https://github.com/apache/couchdb-fauxton/pull/639
Reviewed-By: Benjamin Keen <be...@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/5f07e86c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5f07e86c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5f07e86c
Branch: refs/heads/master
Commit: 5f07e86c3319cb6b0e62599c6bb8807216d95f99
Parents: f2b0fc0
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Feb 3 13:57:02 2016 +0000
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Feb 4 11:35:07 2016 +0000
----------------------------------------------------------------------
app/addons/components/react-components.react.jsx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5f07e86c/app/addons/components/react-components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/components/react-components.react.jsx b/app/addons/components/react-components.react.jsx
index 606d50b..fac7570 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -235,8 +235,7 @@ function (app, FauxtonAPI, React, ReactDOM, Stores, FauxtonComponents, Helpers,
propTypes: {
selectValue: React.PropTypes.string.isRequired,
selectId: React.PropTypes.string.isRequired,
- selectChange: React.PropTypes.func.isRequired,
- selectContent: React.PropTypes.object.isRequired
+ selectChange: React.PropTypes.func.isRequired
},
render: function () {
[2/2] fauxton commit: updated refs/heads/master to 5f07e86
Posted by ro...@apache.org.
fix warning
reason is another race condition between the store's init and the
FauxtonAPI.url helper
PR: #639
PR-URL: https://github.com/apache/couchdb-fauxton/pull/639
Reviewed-By: Benjamin Keen <be...@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/f2b0fc0d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/f2b0fc0d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/f2b0fc0d
Branch: refs/heads/master
Commit: f2b0fc0dc95d4ecc95009d9341e18fa4a83bf79a
Parents: 478a3b3
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Feb 3 11:59:42 2016 +0000
Committer: Robert Kowalski <ro...@apache.org>
Committed: Thu Feb 4 11:35:07 2016 +0000
----------------------------------------------------------------------
app/addons/documents/index-results/stores.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f2b0fc0d/app/addons/documents/index-results/stores.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/index-results/stores.js b/app/addons/documents/index-results/stores.js
index 13918dd..b1bd3dc 100644
--- a/app/addons/documents/index-results/stores.js
+++ b/app/addons/documents/index-results/stores.js
@@ -38,10 +38,8 @@ function (app, FauxtonAPI, ActionTypes, HeaderActionTypes, PaginationActionTypes
},
reset: function () {
- this._collection = new Resources.AllDocs([], {
- database: {
- safeID: function () { return ''; }
- }, params: {limit: 5}
+ this._collection = new Backbone.Collection.extend({
+ url: ''
});
this._filteredCollection = [];