Sort MUC members based on status

Does not currently re-sort in the case of a member coming online

2 files changed, 19 insertions, 4 deletions

diff --git a/src/view/pane/roster.js b/src/view/pane/roster.js
index cde6ab7..70ccd8f 100644
--- a/src/view/pane/roster.js
+++ b/src/view/pane/roster.js
@@ -92,11 +92,11 @@ Candy.View.Pane = (function(self, $) {
 
           // there are already users in the roster
           if(rosterPane.children().length > 0) {
-            // insert alphabetically
-            var userSortCompare = user.getNick().toUpperCase();
+            // insert alphabetically, sorted by status
+            var userSortCompare = self.Roster._userSortCompare(user.getNick(), user.getStatus());
             rosterPane.children().each(function() {
               var elem = $(this);
-              if(elem.attr('data-nick').toUpperCase() > userSortCompare) {
+              if(self.Roster._userSortCompare(elem.attr('data-nick'), elem.attr('data-status')) > userSortCompare) {
                 elem.before(html);
                 userInserted = true;
                 return false;
@@ -187,6 +187,21 @@ Candy.View.Pane = (function(self, $) {
       $(Candy).triggerHandler('candy:view.roster.after-update', evtData);
     },
 
+    _userSortCompare: function(nick, status) {
+      var statusWeight;
+      switch (status) {
+        case 'available':
+          statusWeight = 1;
+          break;
+        case 'unavailable':
+          statusWeight = 9;
+          break;
+        default:
+          statusWeight = 8;
+      }
+      return statusWeight + nick.toUpperCase();
+    },
+
     /** Function: userClick
      * Click handler for opening a private room
      */
diff --git a/src/view/template.js b/src/view/template.js
index 5c3c104..d116709 100644
--- a/src/view/template.js
+++ b/src/view/template.js
@@ -80,7 +80,7 @@ Candy.View.Template = (function(self){
 		pane: '<div class="roster-pane"></div>',
 		user: '<div class="user role-{{role}} affiliation-{{affiliation}}{{#me}} me{{/me}}"' +
 				' id="user-{{roomId}}-{{userId}}" data-jid="{{userJid}}" data-real-jid="{{realJid}}"' +
-				' data-nick="{{nick}}" data-role="{{role}}" data-affiliation="{{affiliation}}">' +
+				' data-nick="{{nick}}" data-role="{{role}}" data-affiliation="{{affiliation}}" data-status="{{status}}">' +
 				'<div class="label">{{displayNick}}</div><ul>' +
 				'<li class="context" id="context-{{roomId}}-{{userId}}">&#x25BE;</li>' +
 				'<li class="role role-{{role}} affiliation-{{affiliation}}" data-tooltip="{{tooltipRole}}"></li>' +