You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/01/14 10:51:17 UTC
[50/50] [abbrv] git commit: updated refs/heads/fauxton-xhr-abort to
8b35f0c
Testing and improvements
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8b35f0cb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8b35f0cb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8b35f0cb
Branch: refs/heads/fauxton-xhr-abort
Commit: 8b35f0cb6217a60437417a51b047da29dfc7b56c
Parents: cd89ba7
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jan 14 11:49:35 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Jan 14 11:49:35 2014 +0200
----------------------------------------------------------------------
src/fauxton/app/api.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8b35f0cb/src/fauxton/app/api.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/api.js b/src/fauxton/app/api.js
index 6d450de..9ac895e 100644
--- a/src/fauxton/app/api.js
+++ b/src/fauxton/app/api.js
@@ -333,7 +333,7 @@ function(app, Fauxton) {
triggerBroadcast('beforeRender', view, selector);
var viewPromise = view.establish();
routeObject.addPromise(viewPromise);
- FauxtonAPI.when(view.establish()).then(function(resp) {
+ FauxtonAPI.when(viewPromise).then(function(resp) {
masterLayout.setView(selector, view);
masterLayout.renderView(selector);