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

Merge branch 'develop' of github.com:lefnire/habitrpg into develop

Browse source
This commit is contained in:
Tyler Renelle 2013-09-17 14:16:11 -04:00
commit 082bfd46da
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/js/controllers/userCtrl.js
View file

@ -17,5 +17,6 @@ habitrpg.controller("UserCtrl", ['$scope', '$location', 'User',
}
$scope.removeWebsite = function($index){
User.user.profile.websites.splice($index,1);
User.set('profile.websites', User.user.profile.websites);
}
}]);

4
views/options/profile.jade
View file

@ -55,11 +55,11 @@
//{{profile.profile.blurb | linky:'_blank'}}
h4 Websites
ul(ng-show='profile.profile.websites')
ul(ng-show='profile.profile.websites.length > 0')
// TODO let's remove links eventually, since we can do markdown on profiles
li(ng-repeat='website in profile.profile.websites')
a(target='_blank', ng-href='{{website}}') {{website}}
span.muted(ng-hide='profile.profile.websites') - None -
span.muted(ng-hide='profile.profile.websites.length > 0') - None -
div.whatever-options(ng-show='_editing.profile')
// TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak