From 0cfb70576268f4f64122e58ccc41d0bfdfa8462f Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Fri, 2 Jan 2015 00:01:44 +0000 Subject: [PATCH] Add behaviour specific to the buy-gems popup. --- views/shared/mixins.jade | 5 +++-- views/shared/modals/buy-gems.jade | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/views/shared/mixins.jade b/views/shared/mixins.jade index 429aab45c1..9fd46f2273 100644 --- a/views/shared/mixins.jade +++ b/views/shared/mixins.jade @@ -1,6 +1,7 @@ mixin gemButton(isGemsModal) - a.pull-right.gem-wallet(ng-click='openModal("buyGems",{track:"Gems > Wallet"})', popover-trigger='mouseenter', popover-title=env.t('gems'), popover=env.t('gemsWhatFor'), popover-placement='bottom') - span.task-action-btn.tile.flush.bright.add-gems-btn + + a.pull-right.gem-wallet(ng-click=( isGemsModal ? '' : 'openModal("buyGems",{track:"Gems > Wallet"})'), popover-trigger='mouseenter', popover-title=env.t('gems'), popover=env.t('gemsWhatFor'), popover-placement='bottom') + if !isGemsModal + span.task-action-btn.tile.flush.bright.add-gems-btn + span.task-action-btn.tile.flush.neutral .Pet_Currency_Gem2x.Gems | {{user.balance * 4 | number:0}} diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade index cac52f7aa3..33862575ab 100644 --- a/views/shared/modals/buy-gems.jade +++ b/views/shared/modals/buy-gems.jade @@ -1,7 +1,7 @@ script(id='modals/buyGems.html', type='text/ng-template') .modal-body .buy-gems - +gemButton + +gemButton(true) .well h3=env.t('buyGems') table.table