paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search typeahead has more suggestions and sorting.

Browse Source 
(imported from commit 5386be57e7f0b820e1a9cbd166c9c43e5e72215b)
This commit is contained in:
Steve Howell
2013-05-03 16:33:35 -04:00
committed by Tim Abbott
parent 77aad147f1
commit 0164d9f757
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zephyr/static/js/search.js
View File

@@ -54,15 +54,30 @@ function render_object(obj) {
} }
exports.update_typeahead = function () { 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}; 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}; 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}; return {action: 'sender', query: elt};
}); });
var options = streams.concat(people).concat(senders); var options = streams.concat(people).concat(senders);
// The first slot is reserved for "search for x". // The first slot is reserved for "search for x".
// (this is updated in the source function for our typeahead as well) // (this is updated in the source function for our typeahead as well)
@@ -131,11 +146,10 @@ function searchbox_sorter(items) {
if (!objs) if (!objs)
return; return;
// Get the first object in sorted order. // 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) (action === 'private_message' || action === 'sender') ? get_person : get_query)
.shift();
if (obj) result = result.concat($.map(objs.slice(0, 5), render_object));
result.push(render_object(obj));
}); });
return result; return result;
@@ -174,7 +188,7 @@ exports.initialize = function () {
return labels; return labels;
}, },
items: 4, items: 30,
highlighter: function (item) { highlighter: function (item) {
var query = this.query; var query = this.query;
var parts = render_object_in_parts(mapped[item]); var parts = render_object_in_parts(mapped[item]);