Merge pull request #408 from candy-chat/fix/empty_priority

Fix handling an empty priority

2 files changed, 22 insertions, 1 deletions

diff --git a/src/core/contact.js b/src/core/contact.js
index 04c3cf5..cc97f02 100644
--- a/src/core/contact.js
+++ b/src/core/contact.js
@@ -112,7 +112,12 @@ Candy.Core.Contact.prototype.getStatus = function() {
     highestResourcePriority;
 
   $.each(this.data.resources, function(resource, obj) {
-    var resourcePriority = parseInt(obj.priority, 10);
+    var resourcePriority;
+    if (obj.priority === undefined || obj.priority === '') {
+      resourcePriority = 0;
+    } else {
+      resourcePriority = parseInt(obj.priority, 10);
+    }
 
     if (obj.show === '' || obj.show === null || obj.show === undefined) {
       // TODO: Submit this as a bugfix to strophejs-plugins' roster plugin
diff --git a/tests/candy/unit/core/contact.js b/tests/candy/unit/core/contact.js
index 2059630..2e926dc 100644
--- a/tests/candy/unit/core/contact.js
+++ b/tests/candy/unit/core/contact.js
@@ -47,6 +47,22 @@ define([
       expect(contact.getGroups()).to.eql(['Friends']);
     });
 
+    bdd.it('defaults the priority to 0 when not defined', function() {
+     contact.data.resources = {
+       'resource1': {
+          show: 'away',
+          status: 'Hanging out',
+          priority: 0
+        },
+       'resource2': {
+          show: 'available',
+          status: 'Not Hanging out',
+          priority: ""
+        }
+      };
+      expect(contact.getStatus()).to.eql('available');
+    });
+
     bdd.describe('aggregate status', function () {
       bdd.describe('when there are no online resources', function () {
         bdd.it('is unavailable when there are no online resources', function () {