From 4fc0234fd457b5743db85070bf7d90ca18b5c321 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Fri, 29 May 2015 18:25:47 -0400 Subject: [PATCH] Added behavior from #5239 (make quest completion modal always display before quest invite modal) --- website/public/js/controllers/notificationCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js index 17ea1774ed..3ddd65f896 100644 --- a/website/public/js/controllers/notificationCtrl.js +++ b/website/public/js/controllers/notificationCtrl.js @@ -148,7 +148,7 @@ habitrpg.controller('NotificationCtrl', }); // Quest invitation modal - $rootScope.$watch('user.party.quest.RSVPNeeded', function(after, before){ + $rootScope.$watch('user.party.quest.RSVPNeeded && (user.party.quest.completed == "" || user.party.quest.completed == undefined)', function(after, before){ if (after != true) return; $rootScope.openModal('questInvitation', {controller:'PartyCtrl'}); });