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/app/services/persistence.coffee |  8 ++------
 js/public/app.js                   | 11 +++--------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee
index cdd389909..4005cf56b 100644
--- a/js/app/services/persistence.coffee
+++ b/js/app/services/persistence.coffee
@@ -37,20 +37,16 @@ $rootScope, $q) ->
 			###
 			Loads the initial data from the server
 			###
-			successCount = 0
 			@deferred = $q.defer()
 
 
 			@getAllFolders()
 
 			successCallback = =>
-				if successCount == 1
-					@deferred.resolve()
-				else
-					successCount++
+				@deferred.resolve()
 
 			@getAllFeeds(successCallback)
-			@getSettings(successCallback)
+			@getSettings()
 
 
 			# items can only be loaded after the active feed is known
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