From 8b29eb530aa0b7e99fd9161e2c9cf1c0d2bdd4c7 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sat, 1 Feb 2014 19:39:05 +0100 Subject: [PATCH] refactor(bs3): port drops modals --- public/js/services/guideServices.js | 6 ++++-- views/shared/modals/drops.jade | 14 +------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/public/js/services/guideServices.js b/public/js/services/guideServices.js index 32df74a401..7c858b8d28 100644 --- a/public/js/services/guideServices.js +++ b/public/js/services/guideServices.js @@ -5,7 +5,7 @@ */ angular.module('guideServices', []). - factory('Guide', ['$rootScope', 'User', '$timeout', function($rootScope, User, $timeout) { + factory('Guide', ['$rootScope', 'User', '$timeout', '$modal', function($rootScope, User, $timeout, $modal) { /** * Init and show the welcome tour. Note we do it listening to a $rootScope broadcasted 'userLoaded' message, @@ -130,7 +130,9 @@ angular.module('guideServices', []). if (!eggs) { eggs['Wolf'] = 1; // This is also set on the server } - $rootScope.modals.dropsEnabled = true; + $modal.open({ + templateUrl: 'modals/dropsEnabled.html' + }); }); $rootScope.$watch('user.items.pets', function(after, before) { diff --git a/views/shared/modals/drops.jade b/views/shared/modals/drops.jade index de42dd85ac..9850d51252 100644 --- a/views/shared/modals/drops.jade +++ b/views/shared/modals/drops.jade @@ -1,4 +1,3 @@ -//div(modal='modals.dropsEnabled') script(type='text/ng-template', id='modals/dropsEnabled.html') .modal-header h3=env.t('dropsEnabled') @@ -11,15 +10,4 @@ script(type='text/ng-template', id='modals/dropsEnabled.html') span.item-drop-icon(class='Pet_Currency_Gem') span!=env.t('useGems') .modal-footer - button.btn.btn-default.cancel(ng-click='modals.dropsEnabled = false')=env.t('close') - -//div(modal='modals.drop') -script(type='text/ng-template', id='modals/drop.html') - .modal-header - h3=env.t('itemDrop') - .modal-body - p - span.item-drop-icon(class='Pet_{{user._tmp.drop.type}}_{{user._tmp.drop.key}}') - | {{user._tmp.drop.dialog}} - .modal-footer - button.btn.btn-default.cancel(ng-click='modals.drop = false')=env.t('close') \ No newline at end of file + button.btn.btn-default.cancel(ng-click='$close()')=env.t('close') \ No newline at end of file