From 2a7adf7285a4f3d441603c233e417b0aef0e0e44 Mon Sep 17 00:00:00 2001 From: Nick Gordon Date: Fri, 22 Nov 2013 22:44:02 -0800 Subject: [PATCH] reverting more bindonce changes... * challenges are not showing, this could be related to the bo-if directive being broken https://github.com/Pasvaz/bindonce/issues/29 * NPCs lost their color because bindonce seems to have a major issue on tags that are using both interpolation and the bo-class directives --- views/options/social/challenge-box.jade | 4 ++-- views/options/social/challenges.jade | 8 ++++---- views/options/social/chat-message.jade | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade index ea8258cb29..09d545635b 100644 --- a/views/options/social/challenge-box.jade +++ b/views/options/social/challenge-box.jade @@ -6,11 +6,11 @@ a.pull-right(target='_blank', href='https://trello.com/card/challenges-individual-party-guild-public/50e5d3684fe3a7266b0036d6/58') i.icon-question-sign .modal-body(bindonce='group.challenges') - div(bo-if='group.challenges.length > 0') + div(ng-if='group.challenges.length > 0') table.table.table-striped tr(ng-repeat='challenge in group.challenges') td a(ui-sref='options.social.challenges.detail({cid:challenge._id})') {{challenge.name}} - div(bo-if='group.challenges.length == 0') + div(ng-if='group.challenges.length == 0') p. No challenges yet, visit Challenges to create one. \ No newline at end of file diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade index b7249de08e..c15d36b32f 100644 --- a/views/options/social/challenges.jade +++ b/views/options/social/challenges.jade @@ -18,7 +18,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.me script(type='text/ng-template', id='partials/options.social.challenges.detail.html') // Edit button - div(bindonce='challenge', bo-if='challenge.leader==user._id') + div(bindonce='challenge', ng-if='challenge.leader==user._id') ul.unstyled li(ng-hide='challenge._locked==false') button.btn.btn-small.btn-default(ng-click='challenge._locked = false') Edit @@ -35,12 +35,12 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht textarea.option-content(cols='3', placeholder='Description', ng-model='challenge.description') hr - .well(bindonce='challenge', bo-if='challenge.description') {{challenge.description}} + .well(bindonce='challenge', ng-if='challenge.description') {{challenge.description}} i.icon-question-sign(popover="These are the challenge's tasks. As users participate, they will change color and gain graphs to show you the overall progress of the group.", popover-trigger='mouseenter', popover-placement='right') habitrpg-tasks(obj='challenge', main=false) // Member List - div(bindonce='challenge', bo-if='challenge.members.length > 0') + div(bindonce='challenge', ng-if='challenge.members.length > 0') h3 How's Everyone Doing? menu button.customize-option(ng-repeat='member in challenge.members', ng-click='toggleMember(challenge._id, member._id)') {{member.profile.name}} @@ -53,7 +53,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht .accordion-heading a.accordion-toggle(ng-click='toggleMember(challenge._id, member._id)') {{member.profile.name}} .accordion-body(ng-class='{collapse: $stateParams.uid != member._id}') - .accordion-inner(bo-if='$stateParams.uid == member._id') + .accordion-inner(ng-if='$stateParams.uid == member._id') div(ui-view) script(type='text/ng-template', id='partials/options.social.challenges.html') diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 4cb1af4a28..9271b75c15 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -9,5 +9,5 @@ li(bindonce='group.chat', ng-repeat='message in group.chat', bo-class='{highligh a(bo-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)') | i.icon-remove(tooltip='Delete') - a.label.chat-message(class='float-label label-contributor-{{message.contributor.level}}', bo-class='{"label-npc": message.backer.npc}', ng-click='clickMember(message.uuid, true)') + a.label.chat-message(ng-class='{"label-npc": message.backer.npc}', class='float-label label-contributor-{{message.contributor.level}}', ng-click='clickMember(message.uuid, true)') span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}}