summaryrefslogtreecommitdiffstats
path: root/js/app/controllers/feedcontroller.coffee
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-03-27 17:19:50 +0100
committerBernhard Posselt <nukeawhale@gmail.com>2013-03-27 17:19:50 +0100
commit02869fdc16bcec5ce142a597c3d203dadd7d2067 (patch)
treec2732cffaa558b34049b4a21069e2a969a4c8ed1 /js/app/controllers/feedcontroller.coffee
parent78674ebc36cf9d24309799651c09a7e194d15ea4 (diff)
adding folders works
Diffstat (limited to 'js/app/controllers/feedcontroller.coffee')
-rw-r--r--js/app/controllers/feedcontroller.coffee13
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)