diff --git a/test/spec/filtersCtrlSpec.js b/test/spec/filtersCtrlSpec.js index 41d53a4cb3..edeaf723e3 100644 --- a/test/spec/filtersCtrlSpec.js +++ b/test/spec/filtersCtrlSpec.js @@ -11,7 +11,8 @@ describe('Filters Controller', function() { })); it('creates a tag', function(){ - scope.createTag('tagName'); + scope._newTag = {name:'tagName'} + scope.createTag(); expect(user.tags).to.have.length(1); expect(user.tags[0].name).to.eql('tagName'); expect(user.tags[0]).to.have.property('id'); diff --git a/website/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js index 201c206977..b1204b86d3 100644 --- a/website/public/js/controllers/filtersCtrl.js +++ b/website/public/js/controllers/filtersCtrl.js @@ -4,6 +4,7 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', function($scope, $rootScope, User, Shared) { var user = User.user; $scope._editing = false; + $scope._newTag = {name:''}; var tagsSnap; // used to compare which tags need updating @@ -29,8 +30,8 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', // User.save(); }; - $scope.createTag = function(name) { - User.user.ops.addTag({body:{name:name, id:Shared.uuid()}}); - $scope._newTag = ''; + $scope.createTag = function() { + User.user.ops.addTag({body:{name:$scope._newTag.name, id:Shared.uuid()}}); + $scope._newTag.name = ''; }; }]); diff --git a/website/views/main/filters.jade b/website/views/main/filters.jade index 95d4f325b0..20e244cce2 100644 --- a/website/views/main/filters.jade +++ b/website/views/main/filters.jade @@ -20,8 +20,8 @@ //- Add new tag li.filters-edit(ng-show='_editing') form.hrpg-input-group - input(type='text', ng-model='_newTag', placeholder=env.t('newTag')) - button(ng-click='createTag(_newTag)')=env.t('add') + input(type='text', ng-model='_newTag.name', placeholder=env.t('newTag')) + button(ng-click='createTag()')=env.t('add') div(ng-if='!areTagsHidden || _editing') ul(ng-if='_editing') li.filters-edit(ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', bindonce='user.tags')