summaryrefslogtreecommitdiffstats
path: root/js/app/services/persistence.coffee
diff options
context:
space:
mode:
Diffstat (limited to 'js/app/services/persistence.coffee')
-rw-r--r--js/app/services/persistence.coffee15
1 files changed, 11 insertions, 4 deletions
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 <http://www.gnu.org/licenses/>.
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