From f5210b68d05675895e71eccc7f572293159521cf Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 14 Oct 2015 22:22:42 -0500 Subject: [PATCH 1/2] Added scrolling to tracks from profile widget --- app/directives/profile-widget/profile-widget.jade | 2 +- app/profile/about/about.jade | 3 ++- app/profile/profile.controller.js | 9 +++++++-- assets/css/directives/profile-widget.scss | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/directives/profile-widget/profile-widget.jade b/app/directives/profile-widget/profile-widget.jade index 051b8a10f..072af1a33 100644 --- a/app/directives/profile-widget/profile-widget.jade +++ b/app/directives/profile-widget/profile-widget.jade @@ -19,7 +19,7 @@ .tracks-links .tracks - .track(ng-repeat="track in (profile.tracks)") + .track(ng-repeat="track in (profile.tracks)", ng-click="profileVm.scrollTo(track)") div(class="{{profileVm.imgMap[track]}}-icon") div .text {{track | role}} diff --git a/app/profile/about/about.jade b/app/profile/about/about.jade index 547996e3a..76543d6c4 100644 --- a/app/profile/about/about.jade +++ b/app/profile/about/about.jade @@ -44,7 +44,8 @@ .track( ng-repeat="track in profileVm.profile.tracks", - ng-if="profileVm.categories[track].length > 0" + ng-if="profileVm.categories[track].length > 0", + id="{{track}}_TRACK" ) div(class="name") diff --git a/app/profile/profile.controller.js b/app/profile/profile.controller.js index 2aea6d266..442104050 100644 --- a/app/profile/profile.controller.js +++ b/app/profile/profile.controller.js @@ -5,16 +5,17 @@ ProfileCtrl.$inject = ['CONSTANTS', '$log', '$q', 'TcAuthService', 'UserService', 'ProfileService', 'ChallengeService', 'ExternalAccountService', - 'userHandle', 'profile', 'ngDialog' + 'userHandle', 'profile', 'ngDialog', '$anchorScroll' ]; - function ProfileCtrl(CONSTANTS, $log, $q, TcAuthService, UserService, ProfileService, ChallengeService, ExternalAccountService, userHandle, profile, ngDialog) { + function ProfileCtrl(CONSTANTS, $log, $q, TcAuthService, UserService, ProfileService, ChallengeService, ExternalAccountService, userHandle, profile, ngDialog, $anchorScroll) { var vm = this; // set profile to the object that was resolved vm.profile = profile; vm.userHandle = userHandle; vm.showBadges = showBadges; vm.closeDialog = closeDialog; + vm.scrollTo = scrollTo; vm.imgMap = { 'DEVELOP': 'develop', @@ -97,6 +98,10 @@ function closeDialog() { ngDialog.close(); } + + function scrollTo(track) { + $anchorScroll(track + '_TRACK'); + } } })(); diff --git a/assets/css/directives/profile-widget.scss b/assets/css/directives/profile-widget.scss index e9eec1edc..deeb09d60 100644 --- a/assets/css/directives/profile-widget.scss +++ b/assets/css/directives/profile-widget.scss @@ -79,6 +79,7 @@ justify-content: flex-end; width: 100%; .track { + pointer: cursor; display: flex; flex-direction: column; align-items: center; From d642b8605189808437dc902975b09c3eba82f37f Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 14 Oct 2015 22:27:02 -0500 Subject: [PATCH 2/2] fixed mistake --- assets/css/directives/profile-widget.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/directives/profile-widget.scss b/assets/css/directives/profile-widget.scss index deeb09d60..916da15c8 100644 --- a/assets/css/directives/profile-widget.scss +++ b/assets/css/directives/profile-widget.scss @@ -79,7 +79,7 @@ justify-content: flex-end; width: 100%; .track { - pointer: cursor; + cursor: pointer; display: flex; flex-direction: column; align-items: center;