From 0164d9f757b09740028bb7c4d7cd61ba921df66f Mon Sep 17 00:00:00 2001
From: Steve Howell <steve@humbughq.com>
Date: Fri, 3 May 2013 16:33:35 -0400
Subject: [PATCH] Search typeahead has more suggestions and sorting.

(imported from commit 5386be57e7f0b820e1a9cbd166c9c43e5e72215b)
---
 zephyr/static/js/search.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/zephyr/static/js/search.js b/zephyr/static/js/search.js
index 5869a6eb2c..3034861ed7 100644
--- a/zephyr/static/js/search.js
+++ b/zephyr/static/js/search.js
@@ -54,15 +54,30 @@ function render_object(obj) {
 }
 
 exports.update_typeahead = function () {
-    var streams = $.map(subs.subscribed_streams(), function(elt,idx) {
+    var stream_names = subs.subscribed_streams().slice(0);
+    stream_names.sort();
+
+    var streams = $.map(stream_names, function(elt,idx) {
         return {action: 'stream', query: elt};
     });
-    var people = $.map(page_params.people_list, function(elt,idx) {
+
+    var people_names = page_params.people_list.slice(0);
+    people_names.sort(function (person1, person2) {
+        if (person1.full_name < person2.full_name)
+            return -1;
+        else if (person1.full_name === person2.full_name)
+            return 0;
+        else
+            return 1;
+    });
+
+    var people = $.map(people_names, function(elt,idx) {
         return {action: 'private_message', query: elt};
     });
-    var senders = $.map(page_params.people_list, function(elt,idx) {
+    var senders = $.map(people_names, function(elt,idx) {
         return {action: 'sender', query: elt};
     });
+
     var options = streams.concat(people).concat(senders);
     // The first slot is reserved for "search for x".
     // (this is updated in the source function for our typeahead as well)
@@ -131,11 +146,10 @@ function searchbox_sorter(items) {
         if (!objs)
             return;
         // Get the first object in sorted order.
-        var obj = typeahead_helper.sorter(query, objs,
+        var objs = typeahead_helper.sorter(query, objs,
                 (action === 'private_message' || action === 'sender') ? get_person : get_query)
-            .shift();
-        if (obj)
-            result.push(render_object(obj));
+
+        result = result.concat($.map(objs.slice(0, 5), render_object));
     });
 
     return result;
@@ -174,7 +188,7 @@ exports.initialize = function () {
 
             return labels;
         },
-        items: 4,
+        items: 30,
         highlighter: function (item) {
             var query = this.query;
             var parts = render_object_in_parts(mapped[item]);