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

take custom overridden profile name into account

Browse source
This commit is contained in:
Tyler Renelle 2013-04-15 09:56:32 -04:00
parent 3a64c1104a
commit 77e7b3e36d
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app/helpers.coffee
View file

@ -24,7 +24,10 @@ removeWhitespace = (str) ->
return '' unless str
str.replace /\s/g, ''
username = (auth) ->
username = (auth, override) ->
#some people define custom profile name in Avatar -> Profile
return override if override?
if auth?.facebook?.displayName?
auth.facebook.displayName
else if auth?.facebook?
@ -74,7 +77,7 @@ viewHelpers = (view) ->
###
User
###
view.fn "username", (auth) -> username(auth)
view.fn "username", (auth, override) -> username(auth, override)
view.fn "tnl", algos.tnl
###

1
src/app/profile.coffee
View file

@ -23,6 +23,5 @@ module.exports.app = (appExports, model) ->
uid = $(el).attr('data-uid')
model.ref '_profileActive', model.at("users.#{uid}")
model.set '_profileActiveMain', user.get('id') is uid
model.set '_profileActiveUsername', helpers.username model.get('_profileActive.auth')
browser.setupTooltips(model)

4
views/app/avatar.html
View file

@ -48,7 +48,7 @@
<avatar:>
<figure class="herobox"
data-name="{{username(@profile.auth)}}"
data-name="{username(@profile.auth, @profile.profile.name)}"
data-level="{@profile.stats.lvl}"
data-checkpet="{#if @profile.items.pet}hasPet{/}"
data-checkuser="{{#if equal(@profile.id, _user.id)}}isUser{{/}}"
@ -188,7 +188,7 @@
{#if _profileActive.profile.name}
{_profileActive.profile.name}
{else}
{username(_profileActive.auth)}
{username(_profileActive.auth, _profileActive.profile.name)}
{/}
{#if _profileActiveMain}<a class='btn pull-right' x-bind="click:profileEdit">Edit</a>{/}
</h3>

10
views/app/party.html
View file

@ -1,15 +1,15 @@
<modals:>
<app:modals:modal modalId="party-modal">
{#if _user.party.current}
<h2>{_party.name}</h2>
<h2>{{_party.name}}</h2>
<table class="table table-striped">
{#each _partyMembers as :member}
<tr><td>{username(:member.auth)}</td><td>({:member.id})</td></tr>
{/}
{{#each _partyMembers as :member}}
<tr><td>{{username(:member.auth, :member.profile.name)}}</td><td>({{:member.id}})</td></tr>
{{/}}
</table>
<form class=form-inline x-bind="submit: partyInvite">
{#if _partyError}
<div class='alert alert-danger'>{_partyError}</div>
<div class='alert alert-danger'>{_partyError}</div>
{/}
<div class='control-group'>
<input type="text" class="input-medium" placeholder="User Id" value="{_newPartyMember}">

2
views/app/settings.html
View file

@ -141,7 +141,7 @@
{{else}}
<ul class="nav site-nav">
<li class="flyout">
<h1 class="task-action-btn tile solid user-reporter">{#if _user.party.invitation}<i class='icon-bell'></i> {/}{{username(_user.auth)}}</h1>
<h1 class="task-action-btn tile solid user-reporter">{#if _user.party.invitation}<i class='icon-bell'></i> {/}{{username(_user.auth, _user.profile.name)}}</h1>
<ul class="flyout-content nav stacked">
<li><a class="task-action-btn tile solid" data-target="#settings-modal" data-toggle="modal">Settings</a></li>
<li><a class="task-action-btn tile solid" data-target="#party-modal" data-toggle="modal">{#if _user.party.invitation}<i class='icon-bell'></i> {/}Party</a></li>