diff options
Diffstat (limited to 'js/app/services/businesslayer')
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 20 | ||||
| -rw-r--r-- | js/app/services/businesslayer/folderbusinesslayer.coffee | 10 |
2 files changed, 14 insertions, 16 deletions
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index 2700caeb5..c82b7de87 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -22,15 +22,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. angular.module('News').factory 'FeedBusinessLayer', -['_BusinessLayer', 'ShowAll', 'Persistence', 'ActiveFeed', 'FeedType', +['_BusinessLayer', 'Settings', 'Persistence', 'ActiveFeed', 'FeedType', 'ItemModel', 'FeedModel', 'NewLoading', '_ExistsError', 'Utils', '$rootScope', 'NewestItem', -(_BusinessLayer, ShowAll, Persistence, ActiveFeed, FeedType, ItemModel, +(_BusinessLayer, Settings, Persistence, ActiveFeed, FeedType, ItemModel, FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> class FeedBusinessLayer extends _BusinessLayer - constructor: (@_showAll, @_feedModel, persistence, activeFeed, feedType, + constructor: (@_settings, @_feedModel, persistence, activeFeed, feedType, itemModel, @_newLoading, @_utils, $rootScope, @_newestItem) -> super(activeFeed, persistence, itemModel, feedType.Feed, $rootScope) @@ -94,7 +94,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> isVisible: (feedId) -> - if @isActive(feedId) or @_showAll.getShowAll() + if @isActive(feedId) or @_settings.get('showAll') return true else return @_feedModel.getFeedUnreadCount(feedId) > 0 @@ -111,7 +111,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> setShowAll: (showAll) -> - @_showAll.setShowAll(showAll) + @_settings.set('showAll', showAll) # TODO: this callback is not tested with a unittest callback = => @@ -124,14 +124,12 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> => @_newLoading.decrease() ) - if showAll - @_persistence.userSettingsReadShow(callback) - else - @_persistence.userSettingsReadHide(callback) + + @_persistence.setSettings(@_settings.getSettings(), callback) isShowAll: -> - return @_showAll.getShowAll() + return @_settings.get('showAll') getAll: -> @@ -189,7 +187,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> @_persistence.importArticles(json, onSuccess) - return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed, + return new FeedBusinessLayer(Settings, FeedModel, Persistence, ActiveFeed, FeedType, ItemModel, NewLoading, Utils, $rootScope, NewestItem) diff --git a/js/app/services/businesslayer/folderbusinesslayer.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee index 60bde1c4e..df2f80dd4 100644 --- a/js/app/services/businesslayer/folderbusinesslayer.coffee +++ b/js/app/services/businesslayer/folderbusinesslayer.coffee @@ -23,15 +23,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. angular.module('News').factory 'FolderBusinessLayer', ['_BusinessLayer', 'FolderModel', 'FeedBusinessLayer', 'Persistence', -'FeedType', 'ActiveFeed', 'ItemModel', 'ShowAll', '_ExistsError', 'OPMLParser', +'FeedType', 'ActiveFeed', 'ItemModel', 'Settings', '_ExistsError', 'OPMLParser', 'NewestItem', 'FeedModel', '$rootScope', (_BusinessLayer, FolderModel, FeedBusinessLayer, Persistence, FeedType, -ActiveFeed, ItemModel, ShowAll, _ExistsError, OPMLParser, NewestItem, +ActiveFeed, ItemModel, Settings, _ExistsError, OPMLParser, NewestItem, FeedModel, $rootScope) -> class FolderBusinessLayer extends _BusinessLayer - constructor: (@_folderModel, @_feedBusinessLayer, @_showAll, activeFeed, + constructor: (@_folderModel, @_feedBusinessLayer, @_settings, activeFeed, persistence, @_feedType, itemModel, @_opmlParser, @_newestItem, @_feedModel, $rootScope) -> super(activeFeed, persistence, itemModel, @_feedType.Folder, $rootScope) @@ -105,7 +105,7 @@ FeedModel, $rootScope) -> isVisible: (folderId) -> - if @_showAll.getShowAll() || + if @_settings.get('showAll') || @_feedBusinessLayer.getFeedsOfFolder(folderId).length == 0 return true else @@ -201,7 +201,7 @@ FeedModel, $rootScope) -> console.info error - return new FolderBusinessLayer(FolderModel, FeedBusinessLayer, ShowAll, + return new FolderBusinessLayer(FolderModel, FeedBusinessLayer, Settings, ActiveFeed, Persistence, FeedType, ItemModel, OPMLParser, NewestItem, FeedModel, $rootScope) |