diff options
Diffstat (limited to 'js/app/controllers/feedcontroller.coffee')
-rw-r--r-- | js/app/controllers/feedcontroller.coffee | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 14e1aea5b..33d23d935 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -103,14 +103,13 @@ angular.module('News').factory '_FeedController', -> @$scope.addFolder = (folderName) => @$scope.folderEmptyError = false @$scope.folderExistsError = false + folderName = folderName.trim() - if angular.isUndefined(folderName) or folderName.trim() == '' + if angular.isUndefined(folderName) or folderName == '' @$scope.folderEmptyError = true else - folderName = folderName.trim() - for folder in @_folderModel.getAll() - if folderName.toLowerCase() == folder.name.toLowerCase() - @$scope.folderExistsError = true + if @_folderModel.nameExists(folderName) + @$scope.folderExistsError = true if not (@$scope.folderEmptyError or @$scope.folderExistsError) @_isAddingFolder = true @@ -119,6 +118,10 @@ angular.module('News').factory '_FeedController', -> @_isAddingFolder = false + @$scope.$on 'createFolder', (scope, folderName) => + $scope.addFolder(folderName) + + toggleFolder: (folderId) -> folder = @_folderModel.getById(folderId) |