From 8588c4602811f698dec26a607bd14ea980c5ce72 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 9 Apr 2014 16:53:00 +0200
Subject: fix user settings request

---
 js/public/app.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'js/public/app.js')

diff --git a/js/public/app.js b/js/public/app.js
index 8aac72b38..0c94f1a57 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -3387,20 +3387,15 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
           			Loads the initial data from the server
           */
 
-          var successCallback, successCount,
+          var successCallback,
             _this = this;
-          successCount = 0;
           this.deferred = $q.defer();
           this.getAllFolders();
           successCallback = function() {
-            if (successCount === 1) {
-              return _this.deferred.resolve();
-            } else {
-              return successCount++;
-            }
+            return _this.deferred.resolve();
           };
           this.getAllFeeds(successCallback);
-          this.getSettings(successCallback);
+          this.getSettings();
           this.getActiveFeed(function() {
             return _this.getItems(_this._activeFeed.getType(), _this._activeFeed.getId());
           });
-- 
cgit v1.2.3