From 219318b405d73ccc371ed9da847c437b3ad733f5 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 28 Oct 2013 18:20:21 -0700 Subject: [PATCH] challenges: remove username(), since we're now using user.profile.name --- src/controllers/groups.js | 2 +- views/options/groups/chat-message.jade | 2 +- views/options/groups/group.jade | 6 +++--- views/shared/header/avatar.jade | 2 +- views/shared/header/menu.jade | 2 +- views/shared/modals/members.jade | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 3b563e047d..65bce46e4d 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -201,7 +201,7 @@ api.postChat = function(req, res, next) { contributor: user.backer && user.backer.contributor, npc: user.backer && user.backer.npc, text: req.query.message, // FIXME this should be body, but ngResource is funky - user: helpers.username(user.auth, user.profile.name), + user: user.profile.name, timestamp: +(new Date) }; diff --git a/views/options/groups/chat-message.jade b/views/options/groups/chat-message.jade index 392627fbcc..af57fc283d 100644 --- a/views/options/groups/chat-message.jade +++ b/views/options/groups/chat-message.jade @@ -1,4 +1,4 @@ -li(ng-repeat='message in group.chat', ng-class='{highlight: message.text.indexOf(username(user.auth,user.profile.name)) != -1}') +li(ng-repeat='message in group.chat', ng-class='{highlight: indexOf(message.text, user.profile.name)}') a.label.chat-message(class='{{nameTagClasses(message)}}', tooltip='{{message.contributor}}', ng-click='clickMember(message.uuid, true)') | {{message.user}} span diff --git a/views/options/groups/group.jade b/views/options/groups/group.jade index cc32f3b157..317a4be77e 100644 --- a/views/options/groups/group.jade +++ b/views/options/groups/group.jade @@ -32,7 +32,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' h4 Assign Group Leader select#group-leader-selection - option(ng-repeat='member in group.members', selected='member._id == _new.groupLeader') {{username(member.auth,member.profile.name)}} + option(ng-repeat='member in group.members', selected='member._id == _new.groupLeader') {{member.profile.name}} button(x-bind='click:assignGroupLeader', ng-click='notPorted()') Assign div(ng-show='group.websites') @@ -68,7 +68,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' // {{/}} a(data-toggle='modal', data-target='#avatar-modal-{{member._id}}') span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)') - | {{username(member.auth, member.profile.name)}} + | {{member.profile.name}} td ({{member._id}}) .modal-footer.whatever-options form.form-inline(ng-submit='invite(group, invitee)') @@ -107,7 +107,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' td .popover.static-popover.fade.right.in.wide-popover .arrow - h3.popover-title {{username(Members.members[group.leader].auth, Members.members[group.leader].profile.name)}} + h3.popover-title {{Members.members[group.leader].profile.name}} .popover-content markdown(ng-model='group.leaderMessage') div(ng-controller='ChatCtrl') diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index 1ba4dbd22d..d4846cffc5 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -1,4 +1,4 @@ -figure.herobox(ng-click='clickMember(profile._id)', data-name='{{username(profile.auth, profile.profile.name)}}', ng-class='{isUser: profile.id==user.id, hasPet: profile.items.pet}', data-level='{{profile.stats.lvl}}', data-uid='{{profile.id}}', rel='popover', data-placement='bottom', data-trigger='hover', data-html='true', data-content="
Level: {{profile.stats.lvl}}
GP: {{profile.stats.gp | number:0}}
{{count(profile.items.pets)}} / 90 Pets Found
") +figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: profile.id==user.id, hasPet: profile.items.pet}', data-level='{{profile.stats.lvl}}', data-uid='{{profile.id}}', rel='popover', data-placement='bottom', data-trigger='hover', data-html='true', data-content="
Level: {{profile.stats.lvl}}
GP: {{profile.stats.gp | number:0}}
{{count(profile.items.pets)}} / 90 Pets Found
") .character-sprites span(ng-class='{zzz:profile.flags.rest}') span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}') diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 5908bf27aa..1baf555a64 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -2,7 +2,7 @@ button.task-action-btn.tile.solid(ng-hide='authenticated()', style='cursor: pointer;', ng-click="modals.login = true") Login / Register ul.nav.site-nav(ng-show='authenticated()') li.flyout(ng-controller='MenuCtrl') - h1.task-action-btn.tile.solid.user-reporter {{username(user.auth, user.profile.name)}} + h1.task-action-btn.tile.solid.user-reporter {{user.profile.name}} ul.flyout-content.nav.stacked li a.task-action-btn.tile.solid diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index 0605979ac7..715dc295d7 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -2,7 +2,7 @@ div(ng-controller='MemberModalCtrl') #memberModal(modal='modals.member') .modal-header h3 - span {{username(profile.auth, profile.profile.name)}} + span {{profile.profile.name}} span(ng-show='profile.backer.contributor') - {{profile.backer.contributor}} .modal-body .row-fluid