couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject couchdb commit: updated refs/heads/fauxton-file-reorder to 136105e
Date Wed, 29 Jan 2014 14:41:19 GMT
Updated Branches:
  refs/heads/fauxton-file-reorder 8f67a9f0f -> 136105e0d


Add back remove old xhrs


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

Branch: refs/heads/fauxton-file-reorder
Commit: 136105e0d03df28ad262cc80b4ec238d4526f04f
Parents: 8f67a9f
Author: Garren Smith <garren.smith@gmail.com>
Authored: Wed Jan 29 16:41:05 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Wed Jan 29 16:41:05 2014 +0200

----------------------------------------------------------------------
 src/fauxton/app/core/routeObject.js | 10 +++++-----
 src/fauxton/app/core/router.js      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/136105e0/src/fauxton/app/core/routeObject.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/core/routeObject.js b/src/fauxton/app/core/routeObject.js
index b449a2e..f3b8672 100644
--- a/src/fauxton/app/core/routeObject.js
+++ b/src/fauxton/app/core/routeObject.js
@@ -229,13 +229,13 @@ function(FauxtonAPI, Backbone) {
     addPromise: function (promise) {
       if (_.isEmpty(promise)) { return; }
 
-      if (_.isArray(promise)) {
-        return _.each(promise, function (p) {
-          this._promises.push(p);
-        }, this);
+      if (!_.isArray(promise)) {
+        return this._promises.push(promise);
       }
 
-     this._promises.push(promise);
+      _.each(promise, function (p) {
+          this._promises.push(p);
+      }, this);
     },
 
     cleanup: function () {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/136105e0/src/fauxton/app/core/router.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/core/router.js b/src/fauxton/app/core/router.js
index 966e171..cc1ca4f 100644
--- a/src/fauxton/app/core/router.js
+++ b/src/fauxton/app/core/router.js
@@ -60,7 +60,7 @@ function(FauxtonAPI, Auth, Backbone) {
           authPromise.then(function () {
             if (!that.activeRouteObject || !that.activeRouteObject.hasRoute(route)) {
               if (that.activeRouteObject) {
-                that.activeRouteObject.removeViews();
+                that.activeRouteObject.cleanup();
               }
               that.activeRouteObject = new RouteObject(route, masterLayout, args);
             }


Mime
View raw message