@@ -15,6 +15,7 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

     @parentList = @attributes['listView']

     @model.on('change', @updateContact)

+    @model.on('change:status', => @parentList.reOrder())

   updateContact: (contact) ->

     @model = contact

@@ -2,6 +2,11 @@ Xmpp.Views.Contacts ||= {}

 class Xmpp.Views.Contacts.ListView extends Backbone.View

   template: JST["backbone/templates/contacts/contact_list"]

+  contactViews: []

+

+  titleClass = ''

+  listClass = ''

+  activeGroup = false

   initialize: () ->

     _.bindAll(this)

@@ -9,10 +14,6 @@ class Xmpp.Views.Contacts.ListView extends Backbone.View

     @el = '#' + @attributes['id']

     @title = I18n.t(@attributes['title'])

-    @titleClass = @listClass = ''

-    @activeGroup = false

-    @contactViews = []

-

     Backbone.Events.on('removeContact', @detachContact)

   createListContainer: ->

@@ -52,7 +53,7 @@ class Xmpp.Views.Contacts.ListView extends Backbone.View

     if (contactHtml?)

       $(@el).find('ul').append(contactHtml)

     else

-      _.each(@contactViews, (i, contact) =>

+      _.each(@contactViews, (contact) =>

         @render(contact.render().el)

       )

@@ -66,4 +67,24 @@ class Xmpp.Views.Contacts.ListView extends Backbone.View

       found = (searchString.search(regex) != -1)

       if found then view.unhide() else view.hide()

-    )

\ No newline at end of file

+    )

+

+  reOrder: ->

+    groupedByStatus = _.groupBy(@contactViews, (view) ->

+      view.model.get('status')

+    )

+

+    sortedGroupNames = {

+      online: groupedByStatus.online

+      away: groupedByStatus.away

+      offline: groupedByStatus.offline

+    }

+

+    sorted = _.map(sortedGroupNames, (group) ->

+      _.sortBy(group, (view) ->

+        view.model.get('name') || view.model.get('jid')

+      )

+    )

+

+    @contactViews = _.flatten(sorted)

+    @render()

\ No newline at end of file