From 99aad9668898e5d73b36d61dd09d68aae5b3e790 Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Sun, 29 Mar 2015 15:10:24 -0400 Subject: [PATCH 1/6] New tag field correctly clears when new tag added. --- website/public/js/controllers/filtersCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js index 201c206977..d67db9b4c8 100644 --- a/website/public/js/controllers/filtersCtrl.js +++ b/website/public/js/controllers/filtersCtrl.js @@ -31,6 +31,6 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', $scope.createTag = function(name) { User.user.ops.addTag({body:{name:name, id:Shared.uuid()}}); - $scope._newTag = ''; + this._newTag = ''; }; }]); From f95f892491efb4dc5d0ea4590cbd7a6c533ef919 Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Mon, 30 Mar 2015 08:32:45 -0400 Subject: [PATCH 2/6] Changed new tag code to be more angular-idiomatic. --- website/public/js/controllers/filtersCtrl.js | 7 ++++--- website/views/main/filters.jade | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/website/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js index d67db9b4c8..18247628f8 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()}}); - this._newTag = ''; + $scope.createTag = function(newTag) { + User.user.ops.addTag({body:{name:newTag.name, id:Shared.uuid()}}); + $scope._newTag.name = ''; }; }]); diff --git a/website/views/main/filters.jade b/website/views/main/filters.jade index 95d4f325b0..cd9cef88c8 100644 --- a/website/views/main/filters.jade +++ b/website/views/main/filters.jade @@ -20,7 +20,7 @@ //- Add new tag li.filters-edit(ng-show='_editing') form.hrpg-input-group - input(type='text', ng-model='_newTag', placeholder=env.t('newTag')) + input(type='text', ng-model='_newTag.name', placeholder=env.t('newTag')) button(ng-click='createTag(_newTag)')=env.t('add') div(ng-if='!areTagsHidden || _editing') ul(ng-if='_editing') From c22acb81a8b5ae558f95c36ee67a34d7c6222f2f Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Mon, 30 Mar 2015 21:58:15 -0400 Subject: [PATCH 3/6] 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') From c2e2122efd166730b5ad35acff5a167841c4831a Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Mon, 30 Mar 2015 22:37:26 -0400 Subject: [PATCH 4/6] Forgot to change part of the new tag test. --- test/spec/filtersCtrlSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/filtersCtrlSpec.js b/test/spec/filtersCtrlSpec.js index 590e5f4420..edeaf723e3 100644 --- a/test/spec/filtersCtrlSpec.js +++ b/test/spec/filtersCtrlSpec.js @@ -12,7 +12,7 @@ describe('Filters Controller', function() { it('creates a tag', function(){ scope._newTag = {name:'tagName'} - scope.createTag('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'); From e35c753bdc65cd1132dd834ffbdc98df521a63c2 Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Tue, 31 Mar 2015 08:55:16 -0400 Subject: [PATCH 5/6] Fixed errors caused by poor git-fu. Forgot I was on a detached head, made a commit, and failed hard at cherry-picking the commit back to the correct branch. --- website/public/js/controllers/filtersCtrl.js | 1 + website/views/main/filters.jade | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js index 19d650ad11..42510223f5 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 diff --git a/website/views/main/filters.jade b/website/views/main/filters.jade index 9a682be309..20e244cce2 100644 --- a/website/views/main/filters.jade +++ b/website/views/main/filters.jade @@ -20,7 +20,7 @@ //- Add new tag li.filters-edit(ng-show='_editing') form.hrpg-input-group - input(type='text', ng-model='_newTag', placeholder=env.t('newTag')) + 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') From 5163ee466b078c9ae859048a5ffcf18a8a6d2379 Mon Sep 17 00:00:00 2001 From: John Montgomery Date: Tue, 31 Mar 2015 23:23:24 -0400 Subject: [PATCH 6/6] Fixes more bad git-fu. New tag creation works now. --- website/public/js/controllers/filtersCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/js/controllers/filtersCtrl.js b/website/public/js/controllers/filtersCtrl.js index 42510223f5..b1204b86d3 100644 --- a/website/public/js/controllers/filtersCtrl.js +++ b/website/public/js/controllers/filtersCtrl.js @@ -32,6 +32,6 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', $scope.createTag = function() { User.user.ops.addTag({body:{name:$scope._newTag.name, id:Shared.uuid()}}); - $scope._newTag = ''; + $scope._newTag.name = ''; }; }]);