diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-12-19 17:47:10 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-12-19 17:47:10 +0100 |
| commit | 015fbb80fcbdf942dc42efe9f1edb53a71a1b9f8 (patch) | |
| tree | 287d78cc5159a403436dde80a977d5054c015bd6 /js/app | |
| parent | 41bf672b4f3878f99b6248ef2567565c21c2d276 (diff) | |
add compact view, fix #267, merry christmas ;D
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/controllers/itemcontroller.coffee | 9 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee index ee2fa7e82..1b5d4a350 100644 --- a/js/app/controllers/itemcontroller.coffee +++ b/js/app/controllers/itemcontroller.coffee @@ -87,6 +87,15 @@ Language, AutoPageLoading, Compact) -> @_$scope.isCompactView = => return @_compact.isCompact() + @_$scope.is = + active: 0 + + @_$scope.toggleOpen = (id) => + if id == @_$scope.is.active + @_$scope.is.active = 0 + else + @_$scope.is.active = id + return new ItemController($scope, ItemBusinessLayer, FeedModel, FeedLoading, AutoPageLoading, FeedBusinessLayer, Language, diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 05558b3e1..176589e9c 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -39,9 +39,6 @@ $rootScope, $q) -> @deferred = $q.defer() - # items can only be loaded after the active feed is known - @getActiveFeed => - @getItems(@_activeFeed.getType(), @_activeFeed.getId()) @getAllFolders() @@ -53,6 +50,10 @@ $rootScope, $q) -> @userSettingsLanguage() @userSettingsIsCompact() + # items can only be loaded after the active feed is known + @getActiveFeed => + @getItems(@_activeFeed.getType(), @_activeFeed.getId()) + @deferred.promise ### |