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

adjust achievement view logic for previous commit

Browse source
This commit is contained in:
Tyler Renelle 2013-05-04 16:04:39 +01:00
parent 0f1ec096ef
commit 7ebe611078
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/app/party.coffee
View file

@ -166,6 +166,7 @@ module.exports.app = (appExports, model, app) ->
return unless /\S/.test text
chat.unshift
id: model.id()
uuid: user.get('id')
contributor: user.get('backer.contributor')
npc: user.get('backer.npc')
text: text
@ -174,8 +175,8 @@ module.exports.app = (appExports, model, app) ->
model.set(input, '')
chat.remove 200 # keep a max messages cap
model.on 'unshift', '_party.chat', -> $('.chatroom [rel="tooltip"]').tooltip()
model.on 'unshift', '_tavern.chat.messages', -> $('.chatroom [rel="tooltip"]').tooltip()
model.on 'unshift', '_party.chat', -> $('.chat-message').tooltip()
model.on 'unshift', '_tavern.chat.messages', -> $('.chat-message').tooltip()
appExports.partySendChat = ->
sendChat('_party.chat', '_chatMessage')

1
src/server/store.coffee
View file

@ -94,6 +94,7 @@ partySystem = (store) ->
'party',
'profile',
'achievements',
'backer',
'preferences',
'auth.local.username',
'auth.facebook.displayName')

8
views/app/avatar.html
View file

@ -178,16 +178,16 @@
<!--<div class='achievement achievement-bow'></div>-->
<!--<div class='achievement achievement-shield'></div>-->
<!--<div class='achievement achievement-karaoke'></div>-->
{{#if equal(@profile.backer.tier,800)}}
<div class='achievement achievement-helm'></div><span class='label label-success'>NPC</span>
{{#if @profile.backer.npc}}
<div class='achievement achievement-helm'></div><span class='label label-success'>{{@profile.backer.npc}} NPC</span>
<hr/>
{{/}}
{{#if @profile.backer.contributor}}
<div class='achievement achievement-firefox'></div><span class='label label-inverse'>Contributor</span>
<div class='achievement achievement-firefox'></div><span class='label label-inverse'>{{@profile.backer.contributor}}</span>
<hr/>
{{/}}
{{#if @profile.backer.tier}}
<div class='achievement achievement-heart'></div>Kickstarter Backer (${{@profile.backer.tier}} Tier)
<div class='achievement achievement-heart'></div>Kickstarter Backer - ${{@profile.backer.tier}} Tier
<hr/>
{{/}}
{#if @profile.achievements.streak}

2
views/app/game-pane.html
View file

@ -89,7 +89,7 @@
<textarea x-bind='keyup:tavernMessageKeyup'>{_tavernMessage}</textarea><br/>
<input class=btn type=submit value=Submit />
</form>
<ul class='unstyled tavern-chat chatroom'>
<ul class='unstyled tavern-chat'>
{#each _tavern.chat.messages as :message}
<li><app:party:chat-message message={{:message}} /></li>
{/}

6
views/app/party.html
View file

@ -25,7 +25,7 @@
<textarea>{_chatMessage}</textarea><br/>
<input class=btn type=submit value=Submit />
</form>
<ul class='unstyled chatroom'>
<ul class='unstyled'>
{#each _party.chat as :message}
<li><app:party:chat-message message={{:message}} /></li>
{/}
@ -60,7 +60,7 @@
<chat-message:>
<hr/>
<span
class="badge {{#if @message.contributor}}badge-inverse{{else if @message.npc}}badge-success{{/}} chat-{{@message.id}}"
class="label {{#if @message.npc}}label-success{{else if @message.contributor}}label-inverse{{else if equal(@message.uuid,_user.id)}}label-info{{/}} chat-message"
rel='tooltip' title="{{@message.contributor}}{{@message.npc}}">
{@message.user}</span> {@message.text} - <span class='muted'>{friendlyTimestamp(@message.timestamp)}
{{@message.user}}</span> {{@message.text}} - <span class='muted'>{{friendlyTimestamp(@message.timestamp)}}
</span>