diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2013-09-03 07:02:34 -0700 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2013-09-03 07:02:34 -0700 |
| commit | 6e6db11d207007ab4077f7baa2e5d8265fdfab57 (patch) | |
| tree | 4f6a136560b65aca2accb0067547cd2b36afa988 /js/app/services/persistence.coffee | |
| parent | 3d2d9e8258405443ded6981662981c0f94342e0a (diff) | |
| parent | 778f7b2be62f5573fb437b1c586dad0e19a31ea1 (diff) | |
Merge pull request #326 from owncloud/first-run
First run page
Diffstat (limited to 'js/app/services/persistence.coffee')
| -rw-r--r-- | js/app/services/persistence.coffee | 15 |
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 |