summaryrefslogtreecommitdiffstats
path: root/js/app/controllers/feedcontroller.coffee
diff options
context:
space:
mode:
Diffstat (limited to 'js/app/controllers/feedcontroller.coffee')
-rw-r--r--js/app/controllers/feedcontroller.coffee10
1 files changed, 4 insertions, 6 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee
index 33d23d935..82586378f 100644
--- a/js/app/controllers/feedcontroller.coffee
+++ b/js/app/controllers/feedcontroller.coffee
@@ -99,15 +99,16 @@ angular.module('News').factory '_FeedController', ->
@_persistence.createFeed(feedUrl.trim(), parentFolderId,
onSuccess, onError)
+
@$scope.addFolder = (folderName) =>
@$scope.folderEmptyError = false
@$scope.folderExistsError = false
- folderName = folderName.trim()
- if angular.isUndefined(folderName) or folderName == ''
+ if angular.isUndefined(folderName) or folderName.trim() == ''
@$scope.folderEmptyError = true
else
+ folderName = folderName.trim()
if @_folderModel.nameExists(folderName)
@$scope.folderExistsError = true
@@ -115,13 +116,10 @@ angular.module('News').factory '_FeedController', ->
@_isAddingFolder = true
@_persistence.createFolder folderName, 0, =>
@$scope.folderName = ''
+ @$scope.addNewFolder = false
@_isAddingFolder = false
- @$scope.$on 'createFolder', (scope, folderName) =>
- $scope.addFolder(folderName)
-
-
toggleFolder: (folderId) ->
folder = @_folderModel.getById(folderId)