From f26b0a2cf52f950e1e8e784a2c5edf57002d2800 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 17 Sep 2013 12:16:16 -0400
Subject: [PATCH] [#1394] add drop notifications back in

---
 public/js/controllers/notificationCtrl.js |  5 +++++
 src/controllers/user.js                   |  1 +
 src/models/user.js                        |  1 +
 views/shared/modals/index.jade            |  3 ++-
 views/shared/modals/pets.jade             | 12 ++++++------
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/public/js/controllers/notificationCtrl.js b/public/js/controllers/notificationCtrl.js
index f1f408694c..11b41a7914 100644
--- a/public/js/controllers/notificationCtrl.js
+++ b/public/js/controllers/notificationCtrl.js
@@ -33,6 +33,11 @@ habitrpg.controller('NotificationCtrl',
       }
     });
 
+    $rootScope.$watch('user._tmp.drop', function(after, before){
+      if (after == before || !after) return;
+      $rootScope.modals.drop = true;
+    });
+
     // FIXME: this isn't working for some reason
     /*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){
       $rootScope.$watch('user.items.' + watched, function(before, after){
diff --git a/src/controllers/user.js b/src/controllers/user.js
index 556183a963..9664c011a2 100644
--- a/src/controllers/user.js
+++ b/src/controllers/user.js
@@ -712,6 +712,7 @@ api.batchUpdate = function(req, res, next) {
     }
     response = user.toJSON();
     response.wasModified = res.locals.wasModified;
+    if (response._tmp && response._tmp.drop) response.wasModified = true;
     res.json(200, response);
     return console.log("Reply sent");
   });
diff --git a/src/models/user.js b/src/models/user.js
index c7fea3994f..b54a2efb35 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -240,6 +240,7 @@ UserSchema.methods.toJSON = function() {
   //});
   //delete doc.tasks
   doc.filters = {};
+  doc._tmp = this._tmp; // be sure to send down drop notifs
 
   return doc;
 };
diff --git a/views/shared/modals/index.jade b/views/shared/modals/index.jade
index 3ff38b60ec..4bf003b160 100644
--- a/views/shared/modals/index.jade
+++ b/views/shared/modals/index.jade
@@ -6,4 +6,5 @@ include ./new-stuff
 include ./why-ads
 include ./more-gems
 include ./members
-include ./settings
\ No newline at end of file
+include ./settings
+include ./pets
\ No newline at end of file
diff --git a/views/shared/modals/pets.jade b/views/shared/modals/pets.jade
index 366ba58e50..5ae1b068f0 100644
--- a/views/shared/modals/pets.jade
+++ b/views/shared/modals/pets.jade
@@ -1,21 +1,21 @@
-div(modal='modals.pets.dropsEnabled')
+div(modal='modals.dropsEnabled')
   .modal-header
     h3 Drops Enabled!
   .modal-body
     p
-      span.item-drop-icon(ng-class='Pet_Egg_{{user.items.eggs.0.name}}')
+      span.item-drop-icon(class='Pet_Egg_{{user.items.eggs.0.name}}')
       | You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. And guess what, you just found a
       strong {{user.items.eggs.0.text}} egg
       | ! {{user.items.eggs.0.notes}}
   .modal-footer
     button.btn.btn-default.cancel(ng-click='modals.pets.dropsEnabled=false') Close
 
-div(modal='modals.pets.itemDropped')
+div(modal='modals.drop')
   .modal-header
     h3 An item has dropped!
   .modal-body
     p
-      span.item-drop-icon(ng-class='Pet_{{_drop.type}}_{{_drop.name}}')
-      | {{_drop.dialog}}
+      span.item-drop-icon(class='Pet_{{user._tmp.drop.type}}_{{user._tmp.drop.name}}')
+      | {{user._tmp.drop.dialog}}
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.pets.itemDropped=false') Close
\ No newline at end of file
+    button.btn.btn-default.cancel(ng-click='modals.drop = false') Close
\ No newline at end of file