Fixed missing data in chat notifications.

Author: jjeffryes

js/templates/notification.html

@@ -37,11 +37,11 @@
                     <div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).format('MMM D, h:mm A') %></div>
                     <% } else if(ob.type == "ORDER") { %>
                     <div class="textSize12px row5">
-                        <% if(ob.handle) { %>
-                        <%= polyglot.t('NotificationNewTransactionMessage',{name:ob.handle}) %>
+                        <% if(ob.username) { %>
+                        <%= polyglot.t('NotificationNewTransactionMessage',{name:ob.username}) %>
                         <% }else{ %>
                             <span class="inlineBlock top3">
-                                <%= polyglot.t('NotificationNewTransactionMessage',{name:ob.guid}) %>
+                                <%= polyglot.t('NotificationNewTransactionMessage',{name:ob.sender}) %>
                             </span>
                         <% } %>
                     </div>
@@ -106,8 +106,12 @@
                             <strong><%= polyglot.t('NotificationTitle',{title: ob.title}) %></strong>
                         </span>
                         <div class="textSize11px txt-fade textWeightNormal">
-                            <% if(ob.handle){ %>
+                            <% if(ob.username){ %>
+                            <%= polyglot.t('NotificationFrom',{name: ob.handle}) %>
+                            <% } else if(ob.handle){ %>
                                 <%= polyglot.t('NotificationFrom',{name: ob.handle}) %>
+                            <% } else if(ob.sender){ %>
+                            <%= polyglot.t('NotificationFrom',{name: ob.handle}) %>
                             <% }else{ %>
                                 <%= polyglot.t('NotificationFrom',{name: ob.guid}) %>
                             <% } %>

js/views/pageNavVw.js

@@ -163,11 +163,17 @@ module.exports = baseVw.extend({
         avatarHash + '&guid=' + notif.guid : 'imgs/defaultUser.png';
       notif.type = notif.type || notif.message_type;
       notifStamp = Date.now();
+      notif.guid = notif.guid || notif.sender;
 
       this.unreadNotifsViaSocket++;
 
       this.notificationsCl.add(
-          __.extend({}, notif, { read: false })
+          __.extend({}, notif, { 
+            read: false,
+            username: username,
+            image_hash: avatarHash,
+            notifStamp: notifStamp,
+          })
       );
 
       //prevent message spamming from one user

js/views/userPageVw.js

@@ -909,8 +909,10 @@ module.exports = baseVw.extend({
 
     this.listenTo(this.followerList, 'usersAdded', ()=>{
       var searchTerms = this.$('#inputFollowing').val();
-      this.followingSearch.reIndex();
-      searchTerms && this.followingSearch.search(searchTerms);
+      if(this.followingSearch){
+        this.followingSearch.reIndex();
+        searchTerms && this.followingSearch.search(searchTerms);
+      }
     });
   },
 
@@ -1716,7 +1718,7 @@ module.exports = baseVw.extend({
     baseVw.prototype.remove.apply(this, arguments);
 
     // close colorbox to make sure the overlay doesnt remain open when going to a different page
-    $.colorbox.close();
+    //$.colorbox.close();
     messageModal.$el.off('click', this.modalCloseHandler);
   }