diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-26 18:04:02 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-26 18:04:02 +0100 |
| commit | c8d3f8fb4681f6993f1c9389e507df0724f56579 (patch) | |
| tree | 312b48cdbc17c23d1e7aac6513f40e0a5813fdbf /js/app/controllers/feedcontroller.coffee | |
| parent | 8e1e0f5281c1ee49fe7f6d84ba8f2b709ebf7f40 (diff) | |
added casting information for data objects
Diffstat (limited to 'js/app/controllers/feedcontroller.coffee')
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 7a61f4ab1..a8be616d9 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -78,29 +78,27 @@ angular.module('News').factory '_FeedController', -> @$scope.addFeed = (feedUrl, parentFolderId=0) => @$scope.feedEmptyError = false - @$scope.feedExistsError = false @$scope.feedError = false if angular.isUndefined(feedUrl) or feedUrl.trim() == '' @$scope.feedEmptyError = true - else - feedUrl = feedUrl.trim() - for feed in @_feedModel.getAll() - if feedUrl == feed.url - @$scope.feedExistsError = true - - if not (@$scope.feedEmptyError or @$scope.feedExistsError) + if not @$scope.feedEmptyError @_isAddingFeed = true - onSuccess = => - @$scope.feedUrl = '' - @_isAddingFeed = false onError = => @$scope.feedError = true @_isAddingFeed = false - @_persistence.createFeed(feedUrl, parentFolderId, onSuccess, - onError) + + onSuccess = (data) => + if data.status == 'error' + onError() + else + @$scope.feedUrl = '' + @_isAddingFeed = false + + @_persistence.createFeed(feedUrl.trim(), parentFolderId, + onSuccess, onError) @$scope.addFolder = (folderName) => @$scope.folderEmptyError = false @@ -137,11 +135,20 @@ angular.module('News').factory '_FeedController', -> isShown: (type, id) -> - if @isShowAll() + hasUnread = @getUnreadCount(type, id) > 0 + if hasUnread return true else - return @getUnreadCount(type, id) > 0 - + if @isShowAll() + switch type + when @_feedType.Subscriptions + return @_feedModel.size() > 0 + when @_feedType.Folder + return @_folderModel.size() > 0 + when @_feedType.Feed + return @_feedModel.size() > 0 + return false + isShowAll: -> return @_showAll.getShowAll() |