From c22acb81a8b5ae558f95c36ee67a34d7c6222f2f Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Mon, 30 Mar 2015 21:58:15 -0400 Subject: [PATCH] Updates new tag code and test spec for new tags. --- test/spec/filtersCtrlSpec.js | 1 + website/public/js/controllers/filtersCtrl.js | 7 +++---- website/views/main/filters.jade | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/spec/filtersCtrlSpec.js b/test/spec/filtersCtrlSpec.js index 41d53a4cb3..590e5f4420 100644 --- a/test/spec/filtersCtrlSpec.js +++ b/test/spec/filtersCtrlSpec.js @@ -11,6 +11,7 @@ describe('Filters Controller', function() { })); it('creates a tag', function(){ + scope._newTag = {name:'tagName'} scope.createTag('tagName'); expect(user.tags).to.have.length(1); expect(user.tags[0].name).to.eql('tagName'); diff --git a/website/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js index 18247628f8..19d650ad11 100644 --- a/website/public/js/controllers/filtersCtrl.js +++ b/website/public/js/controllers/filtersCtrl.js @@ -4,7 +4,6 @@ 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 @@ -30,8 +29,8 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', // User.save(); }; - $scope.createTag = function(newTag) { - User.user.ops.addTag({body:{name:newTag.name, id:Shared.uuid()}}); - $scope._newTag.name = ''; + $scope.createTag = function() { + User.user.ops.addTag({body:{name:$scope._newTag.name, id:Shared.uuid()}}); + $scope._newTag = ''; }; }]); diff --git a/website/views/main/filters.jade b/website/views/main/filters.jade index cd9cef88c8..9a682be309 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.name', placeholder=env.t('newTag')) - button(ng-click='createTag(_newTag)')=env.t('add') + input(type='text', ng-model='_newTag', 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')