From a639038a41831acf4c6b9439cc3d23b9f808d20a Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Mon, 7 Mar 2016 22:43:14 +0000 Subject: [PATCH] Move stat allocation to a mixin to avoid code duplication --- website/views/options/profile.jade | 8 +------- website/views/shared/mixins.jade | 9 +++++++++ website/views/shared/modals/level-up.jade | 8 +------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index 30eea7a748..004b054aec 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -207,13 +207,7 @@ mixin profileStats span.glyphicon.glyphicon-download |  =env.t('distributePoints') - each statInfo, stat in { str: {title:"allocateStr",popover:'strengthText',allocatepop:'allocateStrPop'},int: {title:"allocateInt",popover:'intText',allocatepop:'allocateIntPop'},con: {title:"allocateCon",popover:'conText',allocatepop:'allocateConPop'},per: {title:"allocatePer",popover:'perText',allocatepop:'allocatePerPop'} } - tr - td - span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.popover)) - =env.t(statInfo.title) + ' {{user.stats.' + stat + '}}' - td - a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("#{stat}")', popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.allocatepop)) + + +statAllocation div(ng-class='user.flags.classSelected && !user.preferences.disableClasses ? "col-md-4" : "col-md-6"') diff --git a/website/views/shared/mixins.jade b/website/views/shared/mixins.jade index e977416c11..b7b5d261f8 100644 --- a/website/views/shared/mixins.jade +++ b/website/views/shared/mixins.jade @@ -33,3 +33,12 @@ mixin ownedQuests(popoverAppend, popoverPlacement) popover-append-to-body='#{popoverAppend}', popover-placement='#{popoverPlacement}') .badge.badge-info.stack-count {{points}} + +mixin statAllocation + each statInfo, stat in { str: {title:"allocateStr",popover:'strengthText',allocatepop:'allocateStrPop'},int: {title:"allocateInt",popover:'intText',allocatepop:'allocateIntPop'},con: {title:"allocateCon",popover:'conText',allocatepop:'allocateConPop'},per: {title:"allocatePer",popover:'perText',allocatepop:'allocatePerPop'} } + tr + td + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.popover)) + =env.t(statInfo.title) + ' {{user.stats.' + stat + '}}' + td + a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("#{stat}")', popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.allocatepop)) + diff --git a/website/views/shared/modals/level-up.jade b/website/views/shared/modals/level-up.jade index f8d5a216fa..7bf58bc095 100644 --- a/website/views/shared/modals/level-up.jade +++ b/website/views/shared/modals/level-up.jade @@ -29,13 +29,7 @@ script(type='text/ng-template', id='modals/levelUp.html') | {{user.stats.points}}  strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('quickAllocationLevelPopover'))=env.t('unallocated') td - each statInfo, stat in { str: {title:"allocateStr",popover:'strengthText',allocatepop:'allocateStrPop'},int: {title:"allocateInt",popover:'intText',allocatepop:'allocateIntPop'},con: {title:"allocateCon",popover:'conText',allocatepop:'allocateConPop'},per: {title:"allocatePer",popover:'perText',allocatepop:'allocatePerPop'} } - tr - td - span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.popover)) - =env.t(statInfo.title) + ' {{user.stats.' + stat + '}}' - td - a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("#{stat}")', popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.allocatepop)) + + +statAllocation button.btn.btn-primary(ng-click='$close()')=env.t('huzzah') .checkbox label(style='display:inline-block')=env.t('dontShowAgain')