From 778f7b2be62f5573fb437b1c586dad0e19a31ea1 Mon Sep 17 00:00:00 2001 From: Alessandro Cosentino Date: Mon, 2 Sep 2013 23:42:55 -0400 Subject: all the firstrunpage in one commit --- js/app/services/persistence.coffee | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'js/app/services/persistence.coffee') diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 59a28489c..e1562fc46 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -22,9 +22,9 @@ License along with this library. If not, see . angular.module('News').factory 'Persistence', ['Request', 'FeedLoading', 'AutoPageLoading', 'NewLoading', 'Config', -'ActiveFeed', '$rootScope', +'ActiveFeed', '$rootScope', '$q' (Request, FeedLoading, AutoPageLoading, NewLoading, Config, ActiveFeed, -$rootScope) -> +$rootScope, $q) -> class Persistence @@ -37,15 +37,22 @@ $rootScope) -> Loads the initial data from the server ### + @deferred = $q.defer() + # items can only be loaded after the active feed is known @getActiveFeed => @getItems(@_activeFeed.getType(), @_activeFeed.getId()) - + @getAllFolders() - @getAllFeeds() + + successCallback = => + @deferred.resolve() + + @getAllFeeds(successCallback) @userSettingsRead() @userSettingsLanguage() + @deferred.promise ### ITEM CONTROLLER -- cgit v1.2.3