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 667A7183BF for ; Thu, 4 Feb 2016 11:35:30 +0000 (UTC) Received: (qmail 37661 invoked by uid 500); 4 Feb 2016 11:35:30 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 37562 invoked by uid 500); 4 Feb 2016 11:35:30 -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 37546 invoked by uid 99); 4 Feb 2016 11:35:30 -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; Thu, 04 Feb 2016 11:35:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BFC4E08E7; Thu, 4 Feb 2016 11:35:30 +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: Thu, 04 Feb 2016 11:35:31 -0000 Message-Id: <80ecd711d93040c0b7cd0d08355d0968@git.apache.org> In-Reply-To: <9cc67c9ddd5e472ca18295f096f2c9e9@git.apache.org> References: <9cc67c9ddd5e472ca18295f096f2c9e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] fauxton commit: updated refs/heads/master to 5f07e86 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 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 Authored: Wed Feb 3 11:59:42 2016 +0000 Committer: Robert Kowalski 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 = [];