sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 07:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4938 from ExperimentMonty/clear-after-add-task

Browse source 
New tag field correctly clears when new tag added.
This commit is contained in:
Alys 2015-04-04 01:16:21 +10:00
commit 5f3e57274d
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/spec/filtersCtrlSpec.js
View file

@ -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');

7
website/public/js/controllers/filtersCtrl.js
View file

@ -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 = '';
};
}]);

4
website/views/main/filters.jade
View file

@ -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')