Fix workers sorting, it should be done based on SortableMixin

assets/scripts/app/controllers/sidebar.coffee

@@ -15,31 +15,12 @@ Travis.reopen
         groups = {}
         for worker in content.toArray()
           host = worker.get('host')
-          groups[host] = Em.ArrayProxy.create(content: []) unless groups[host]
+          unless groups[host]
-          groups[host].pushObject(worker)
+            groups[host] = Em.ArrayProxy.create(Em.SortableMixin,
-
+              content: [],
-        prepareForSort = (str) ->
+              sortProperties: ['nameForSort']
-          match = str.match /(.*?)-(\d+)/
+            )
-          name = match[1]
+          groups[host].addObject(worker)
-          id   = match[2].toString()
-          if id.length < 2
-            id = "00#{id}"
-          else if id.length < 3
-            id = "0#{id}"
-
-          "#{name}-#{id}"
-
-        for own host, workers of groups
-          groups[host] = workers.toArray().sort (a, b) ->
-            a = prepareForSort a.get('name')
-            b = prepareForSort b.get('name')
-
-            if a < b
-              -1
-            else if b < a
-              1
-            else
-              0
 
         $.values(groups)
     ).property('length')

assets/scripts/app/models/worker.coffee

@@ -29,3 +29,17 @@ require 'travis/model'
   job: (->
     Travis.Job.find @get('job_id')
   ).property('job_id')
+
+  nameForSort: (->
+    if name = @get('name')
+      match = name.match /(.*?)-(\d+)/
+      if match
+        name = match[1]
+        id   = match[2].toString()
+        if id.length < 2
+          id = "00#{id}"
+        else if id.length < 3
+          id = "0#{id}"
+
+        "#{name}-#{id}"
+  ).property('name')