From e5a02456391cc5991f3705ceef1487dcf80342cc Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 13 Sep 2013 00:53:13 -0700
Subject: [PATCH] Simplify some more. Display is broken until views bind
 classes properly

---
 clientapp/helpers/xmppEventHandlers.js |  4 +--
 clientapp/models/contact.js            | 43 +++++++++++++-------------
 package.json                           |  2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/clientapp/helpers/xmppEventHandlers.js b/clientapp/helpers/xmppEventHandlers.js
index c295b3d..0655474 100644
--- a/clientapp/helpers/xmppEventHandlers.js
+++ b/clientapp/helpers/xmppEventHandlers.js
@@ -230,8 +230,8 @@ module.exports = function (client, app) {
             contact.addMessage(message, true);
 
             if (!contact.lockedResource) {
-                contact.lockedResource = msg.from.full;
-            } else if (msg.from.full !== contact.lockedResource) {
+                contact.lockedResource = contact.resources.get(msg.from.full);
+            } else if (msg.from.full !== contact.lockedResource.id) {
                 contact.lockedResource = undefined;
             }
         }
diff --git a/clientapp/models/contact.js b/clientapp/models/contact.js
index 9f81fd6..0181692 100644
--- a/clientapp/models/contact.js
+++ b/clientapp/models/contact.js
@@ -1,5 +1,5 @@
 /*global XMPP, app, me, client*/
-//"use strict";
+"use strict";
 
 var _ = require('underscore');
 var async = require('async');
@@ -23,25 +23,25 @@ module.exports = HumanModel.define({
     type: 'contact',
     props: {
         id: ['string', true, false],
+        avatarID: ['string', true, ''],
+        groups: ['array', true, []],
         inRoster: ['bool', true, false],
-        owner: ['string', true, ''],
-        storageId: ['string', true, ''],
         jid: ['string', true],
         name: ['string', true, ''],
-        subscription: ['string', true, 'none'],
-        groups: ['array', true, []],
-        avatarID: ['string', true, '']
+        owner: ['string', true, ''],
+        storageId: ['string', true, ''],
+        subscription: ['string', true, 'none']
     },
     session: {
-        topResource: 'string',
-        lockedResource: 'string',
-        offlineStatus: ['string', true, ''],
+        activeContact: ['bool', true, false],
         avatar: 'string',
         chatState: ['string', true, 'gone'],
+        lastInteraction: 'date',
         lastSentMessage: 'object',
-        activeContact: ['bool', true, false],
-        unreadCount: ['number', true, 0],
-        lastInteraction: 'date'
+        lockedResource: 'object',
+        offlineStatus: ['string', true, ''],
+        topResource: 'object',
+        unreadCount: ['number', true, 0]
     },
     derived: {
         displayName: {
@@ -54,10 +54,10 @@ module.exports = HumanModel.define({
             deps: ['topResource', 'lockedResource', 'offlineStatus'],
             fn: function () {
                 if (this.lockedResource) {
-                    return this.resources.get(this.lockedResource).status;
+                    return this.lockedResource.status;
                 }
                 if (this.topResource) {
-                    return this.resources.get(this.topResource).status;
+                    return this.topResource.status;
                 }
                 return this.offlineStatus;
             }
@@ -66,10 +66,10 @@ module.exports = HumanModel.define({
             deps: ['topResource', 'lockedResource'],
             fn: function () {
                 if (this.lockedResource) {
-                    return this.resources.get(this.lockedResource).show || 'online';
+                    return this.lockedResource.show || 'online';
                 }
                 if (this.topResource) {
-                    return this.resources.get(this.topResource).show || 'online';
+                    return this.topResource.show || 'online';
                 }
                 return 'offline';
             }
@@ -78,10 +78,10 @@ module.exports = HumanModel.define({
             deps: ['topResource', 'lockedResource'],
             fn: function () {
                 if (this.lockedResource) {
-                    return this.resources.get(this.lockedResource).idleSince;
+                    return this.lockedResource.idleSince;
                 }
                 if (this.topResource) {
-                    return this.resources.get(this.topResource).idleSince;
+                    return this.topResource.idleSince;
                 }
             }
         },
@@ -89,10 +89,10 @@ module.exports = HumanModel.define({
             deps: ['topResource', 'lockedResource'],
             fn: function () {
                 if (this.lockedResource) {
-                    return this.resources.get(this.lockedResource).timezoneOffset;
+                    return this.lockedResource.timezoneOffset;
                 }
                 if (this.topResource) {
-                    return this.resources.get(this.topResource).timezoneOffset;
+                    return this.topResource.timezoneOffset;
                 }
             }
         },
@@ -171,8 +171,9 @@ module.exports = HumanModel.define({
         var res = this.resources.first();
         if (res) {
             this.offlineStatus = '';
-            this.topResource = res.id;
+            this.topResource = res;
         } else {
+            this.topResource = undefined;
             this.chatState = 'gone';
         }
 
diff --git a/package.json b/package.json
index 046e58d..8843175 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "node-uuid": "1.4.1",
         "semi-static": "0.0.4",
         "sound-effect-manager": "0.0.5",
-        "human-model": "1.1.0",
+        "human-model": "1.1.1",
         "human-view": "1.1.2",
         "templatizer": "0.1.2",
         "underscore": "1.5.1"