From 3e077fea6dc8d2d60d5573cd5a3c57a5f00d087d Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 2 Feb 2014 13:52:42 +0100 Subject: [PATCH] refactor(bs3): port rebirth and reroll modals, misc fixes --- public/js/controllers/settingsCtrl.js | 2 -- public/js/services/guideServices.js | 8 ++++++-- views/options/inventory/inventory.jade | 4 ++-- views/shared/modals/rebirth.jade | 8 +++----- views/shared/modals/reroll.jade | 5 ++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 8ad6419a14..89bf06a638 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -55,13 +55,11 @@ habitrpg.controller('SettingsCtrl', $scope.reroll = function(){ User.user.ops.reroll({}); - $rootScope.modals.reroll = false; $rootScope.$state.go('tasks'); } $scope.rebirth = function(){ User.user.ops.rebirth({}); - $rootScope.modals.rebirth = false; $rootScope.$state.go('tasks'); } diff --git a/public/js/services/guideServices.js b/public/js/services/guideServices.js index 7c858b8d28..1f860e6fa9 100644 --- a/public/js/services/guideServices.js +++ b/public/js/services/guideServices.js @@ -139,13 +139,17 @@ angular.module('guideServices', []). if (User.user.achievements && User.user.achievements.beastMaster) return; if (before >= 90) { User.set({'achievements.beastMaster': true}); - $('#beastmaster-achievement-modal').modal('show'); // FIXME + $modal.open({ + templateUrl: 'modals/achievements/beastMaster.html' + }); } }); $rootScope.$watch('user.flags.rebirthEnabled', function(after, before) { if (alreadyShown(before, after)) return; - $rootScope.modals.rebirthEnabled = true; + $modal.open({ + templateUrl: 'modals/rebirthEnabled.html' + }); }); diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 3fab6be8c2..751b57d897 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -123,7 +123,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | {{Content.food.Saddle.value}} span.Pet_Currency_Gem1x.inline-gems div - button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('fortifyName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true', class='inventory_special_fortify') + button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('fortifyName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("reroll")', class='inventory_special_fortify') p | 4 span.Pet_Currency_Gem1x.inline-gems @@ -133,7 +133,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | {{Content.spells.special.snowball.value}} span.Pet_Currency_Gem1x.inline-gems div(ng-show='user.flags.rebirthEnabled') - button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.rebirth = true', class='rebirth_orb') + button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("rebirth")', class='rebirth_orb') p | 8 span.Pet_Currency_Gem1x.inline-gems diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade index 9853aead02..270533dbec 100644 --- a/views/shared/modals/rebirth.jade +++ b/views/shared/modals/rebirth.jade @@ -1,6 +1,5 @@ // Created by Sabe on 12/22/13. -//div(modal='modals.rebirthEnabled') script(type='text/ng-template', id='modals/rebirthEnabled.html') .modal-header h3=env.t('rebirthNew') @@ -9,9 +8,8 @@ script(type='text/ng-template', id='modals/rebirthEnabled.html') p span=env.t('rebirthUnlock') .modal-footer - button.btn.btn-default.cancel(ng-click='modals.rebirthEnabled = false')=env.t('close') + button.btn.btn-default.cancel(ng-click='$close()')=env.t('close') -//div(modal='modals.rebirth') script(type='text/ng-template', id='modals/rebirth.html') .modal-header h3=env.t('rebirthBegin') @@ -37,12 +35,12 @@ script(type='text/ng-template', id='modals/rebirth.html') .achievement-sun.pull-left(style='margin-right: 5px') p=env.t('rebirthEarnAchievement') .modal-footer - button.btn.btn-large.cancel(ng-click='modals.rebirth = false')=env.t('neverMind') + button.btn.btn-large.cancel(ng-click='$close()')=env.t('neverMind') span(ng-if='user.balance < 2') a.btn.btn-success.btn-large(ng-click='openModal("buyGems")')=env.t('buyMoreGems') span.gem-cost=env.t('notEnoughGems') span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl') - a.btn.btn-danger.btn-large(ng-click='rebirth()')=env.t('beReborn') + a.btn.btn-danger.btn-large(ng-click='$close(); rebirth()')=env.t('beReborn') span.gem-cost | 8  =env.t('gems') diff --git a/views/shared/modals/reroll.jade b/views/shared/modals/reroll.jade index 8bc484eb62..2840418ade 100644 --- a/views/shared/modals/reroll.jade +++ b/views/shared/modals/reroll.jade @@ -1,5 +1,4 @@ // Re-Roll modal -//div(modal='modals.reroll') script(type='text/ng-template', id='modals/reroll.html') .modal-header h3=env.t('fortify') @@ -8,12 +7,12 @@ script(type='text/ng-template', id='modals/reroll.html') p=env.t('fortifyText') .modal-footer - button.btn.btn-large.cancel(ng-click='modals.reroll = false')=env.t('neverMind') + button.btn.btn-large.cancel(ng-click='$close()')=env.t('neverMind') span(ng-if='user.balance < 1') a.btn.btn-success.btn-large(ng-click='openModal("buyGems")')=env.t('buyMoreGems') span.gem-cost=env.t('notEnoughGems') span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl') - a.btn.btn-danger.btn-large(ng-click='reroll()')=env.t('fortify') + a.btn.btn-danger.btn-large(ng-click='$close(); reroll()')=env.t('fortify') span.gem-cost | 4  = env.t('gems')