diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-26 14:45:39 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-26 14:45:39 +0100 |
| commit | 8e1e0f5281c1ee49fe7f6d84ba8f2b709ebf7f40 (patch) | |
| tree | 30bc99a02a414de50e1461c9f6b6289b44e3c543 /js/app | |
| parent | cd3b748f65cc98185c56fd110a140ad2206c319b (diff) | |
added logic for adding feeds
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 46 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 4 |
2 files changed, 24 insertions, 26 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index fea2cb46d..7a61f4ab1 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -67,34 +67,40 @@ angular.module('News').factory '_FeedController', -> @$scope.setShowAll = (showAll) => @setShowAll(showAll) - @$scope.addFeed = (feedUrl, parentFolderId) => - ### + @$scope.isAddingFolder = => + return @_isAddingFolder + + @$scope.isAddingFeed = => + return @_isAddingFeed + + @$scope.toggleFolder = (folderId) => + @toggleFolder(folderId) + + @$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.getItems() - if feedUrl == feed.feedUrl # FIXME: can we really compare this + for feed in @_feedModel.getAll() + if feedUrl == feed.url @$scope.feedExistsError = true - + + if not (@$scope.feedEmptyError or @$scope.feedExistsError) - if angular.isUndefined(parentFolderId) - folderId = 0 - else - folderId = folder.id - @$scope.adding = true + @_isAddingFeed = true + onSuccess = => @$scope.feedUrl = '' - @$scope.adding = false + @_isAddingFeed = false onError = => @$scope.feedError = true - @$scope.adding = false - @persistence.createFeed(url, folderId, onSuccess, onError) - ### + @_isAddingFeed = false + @_persistence.createFeed(feedUrl, parentFolderId, onSuccess, + onError) @$scope.addFolder = (folderName) => @$scope.folderEmptyError = false @@ -115,16 +121,6 @@ angular.module('News').factory '_FeedController', -> @_isAddingFolder = false - @$scope.isAddingFolder = => - return @_isAddingFolder - - @$scope.isAddingFeed = => - return @_isAddingFeed - - @$scope.toggleFolder = (folderId) => - @toggleFolder(folderId) - - toggleFolder: (folderId) -> folder = @_folderModel.getById(folderId) diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 200145c71..8e0564002 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -145,7 +145,9 @@ angular.module('News').factory '_Persistence', -> @_request.get 'news_feeds_active', params - createFeed: (url, parentFolderId, onSuccess, onFailure) -> + createFeed: (url, parentFolderId, onSuccess=null, onFailure=null) -> + onSuccess or= -> + onFailure or= -> params = data: parentFolderId: parentFolderId |