From d29971695e9fba19ef67a3d01b51e03605960fbe Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Fri, 26 Dec 2014 00:17:03 +0000 Subject: [PATCH 1/3] Define the variable to control display of the + icon and the onClick functionality --- views/shared/modals/buy-gems.jade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade index 8cb78cc0b2..2a6a0825ac 100644 --- a/views/shared/modals/buy-gems.jade +++ b/views/shared/modals/buy-gems.jade @@ -1,7 +1,9 @@ script(id='modals/buyGems.html', type='text/ng-template') .modal-body .buy-gems + - var isGemsModal = true include ../gems + - isGemsModal = false .well h3=env.t('buyGems') table.table From c65fe65d4e4c0bc1d6cbe25ea6238176fa3e02d5 Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Fri, 26 Dec 2014 00:19:02 +0000 Subject: [PATCH 2/3] Remove the + icon if this file is included in the Buy Gems popup --- views/shared/gems.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/shared/gems.jade b/views/shared/gems.jade index 9b78852cb8..c1e6c03205 100644 --- a/views/shared/gems.jade +++ b/views/shared/gems.jade @@ -1,5 +1,6 @@ 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 ＋ + 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}} From 33ed0794b995f7511a9f890fd7295d68a27f581e Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Fri, 26 Dec 2014 01:06:30 +0000 Subject: [PATCH 3/3] Remove the onClick action of this file is included in the Buy Gems popup --- views/shared/gems.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/gems.jade b/views/shared/gems.jade index c1e6c03205..1ef13bb54f 100644 --- a/views/shared/gems.jade +++ b/views/shared/gems.jade @@ -1,4 +1,4 @@ -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') +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