Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't recompute search typeahead source every time. 

(imported from commit 8e7ffa76ec701519704280caa282eb4639998a42)
This commit is contained in:
Waseem Daher 2012-11-18 19:31:23 -05:00
parent 57d35649f3
commit 53f5480fc4
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,37 @@ var cached_table = $('table.focused_table');
var labels = [];
var mapped = {};
function render_object(obj) {
if (obj.action === 'search') {
return "Search for " + obj.query;
} else if (obj.action === 'stream') {
return "Narrow to stream " + obj.query;
} else if (obj.action === 'private_message') {
return "Narrow to person " + obj.query.full_name + " <" + obj.query.email + ">";
}
return "Error";
}
exports.update_typeahead = function() {
var streams = $.map(stream_list, function(elt,idx) {
return {action: 'stream', query: elt};
});
var people = $.map(people_list, function(elt,idx) {
return {action: 'private_message', query: elt};
});
var options = streams.concat(people);
// The first slot is reserved for our query.
options.unshift({action: 'search', query: ''});
mapped = {};
labels = [];
$.each(options, function (i, obj) {
var label = render_object(obj);
mapped[label] = obj;
labels.push(label);
});
};
function narrow_or_search_for_term(item) {
var obj = mapped[item];
if (obj.action === "search") {
@ -28,36 +59,17 @@ function narrow_or_search_for_term(item) {
return item;
}
function render_object(obj) {
if (obj.action === 'search') {
return "Search for " + obj.query;
} else if (obj.action === 'stream') {
return "Narrow to stream " + obj.query;
} else if (obj.action === 'private_message') {
return "Narrow to person " + obj.query.full_name + " <" + obj.query.email + ">";
}
return "Error";
}
exports.initialize = function () {
$( "#search_query" ).typeahead({
source: function (query, process) {
var streams = $.map(stream_list, function(elt,idx) {
return {action: 'stream', query: elt};
});
var people = $.map(people_list, function(elt,idx) {
return {action: 'private_message', query: elt};
});
var options = streams.concat(people);
options.unshift({action: 'search', query: query});
mapped = {};
labels = [];
$.each(options, function (i, obj) {
var label = render_object(obj);
mapped[label] = obj;
labels.push(label);
});
// Delete our old search query
var old_label = labels.shift();
delete mapped[old_label];
// Add our new one
var obj = {action: 'search', query: query};
var label = render_object(obj);
mapped[label] = obj;
labels.unshift(label);
return labels;
},
items: 3,

1
zephyr/static/js/typeahead_helper.js
View File

@ -20,6 +20,7 @@ exports.update_autocomplete = function () {
});
composebox_typeahead.update_typeahead();
search.update_typeahead();
autocomplete_needs_update = false;
};