From 77e7b3e36d6194683d19036e25a474d7564029f1 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 15 Apr 2013 09:56:32 -0400
Subject: [PATCH] take custom overridden profile name into account

---
 src/app/helpers.coffee  |  7 +++++--
 src/app/profile.coffee  |  1 -
 views/app/avatar.html   |  4 ++--
 views/app/party.html    | 10 +++++-----
 views/app/settings.html |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 8ce9d1659e..621744cb21 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -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
 
   ###
diff --git a/src/app/profile.coffee b/src/app/profile.coffee
index defe3bc955..15786120c6 100644
--- a/src/app/profile.coffee
+++ b/src/app/profile.coffee
@@ -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)
 
diff --git a/views/app/avatar.html b/views/app/avatar.html
index e319cc8134..97469583d2 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -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>
diff --git a/views/app/party.html b/views/app/party.html
index 43df76e7cc..75e7058b4a 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -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}">
diff --git a/views/app/settings.html b/views/app/settings.html
index 30e7d8bbbd..69d1b469d1 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -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>