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

Fix autocomplete

Browse Source 
There were two issues:
* The people_list population changed and I failed to noticed
* Typeahead source updating never worked before because calling .typeahead()
  more than once does not change the data source

(imported from commit fda14029f4cd37260d82e7bb5689f5022e1b0d28)
This commit is contained in:
Zev Benjamin
2012-10-12 16:51:44 -04:00
parent 78ad6a03f2
commit bc4487ebf9
2 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/zephyr/index.html
View File

@@ -58,7 +58,8 @@ var stream_list = [
var people_list = [
{% for person in people %}
"{{ person|escapejs }}",
{ 'email': "{{ person.email|escapejs }}",
'full_name': "{{ person.full_name|escapejs }}" },
{% endfor %}
];

91
zephyr/static/js/ui.js
View File

@@ -112,52 +112,20 @@ var autocomplete_needs_update = false;
function update_autocomplete() {
stream_list.sort();
people_list.sort();
people_list.sort(function (x, y) {
if (x.email === y.email) return 0;
if (x.email < y.email) return -1;
return 1;
});
var huddle_typeahead_list = $.map(people_list, function (person) {
return person.full_name + " <" + person.email + ">";
});
// limit number of items so the list doesn't fall off the screen
$( "#stream" ).typeahead({
source: stream_list,
items: 3
});
$( "#subject" ).typeahead({
source: function (query, process) {
var stream_name = $("#stream").val();
if (subject_dict.hasOwnProperty(stream_name)) {
return subject_dict[stream_name];
}
return [];
},
items: 2
});
$( "#huddle_recipient" ).typeahead({
source: huddle_typeahead_list,
items: 4,
matcher: function (item) {
// Assumes email addresses don't have commas or semicolons in them
var current_recipient = $(this.query.split(/[,;] ?/)).last()[0];
// Case-insensitive (from Bootstrap's default matcher).
return (item.toLowerCase().indexOf(current_recipient.toLowerCase()) !== -1);
},
updater: function (item) {
var previous_recipients = this.query.split(/[,;] ?/);
previous_recipients.pop();
previous_recipients = previous_recipients.join(", ");
if (previous_recipients.length !== 0) {
previous_recipients += ", ";
}
// Extracting the email portion via regex is icky, but the Bootstrap
// typeahead widget doesn't seem to be flexible enough to pass
// objects around
var email_re = /<[^<]*>$/;
var email = email_re.exec(item)[0];
return previous_recipients + email.substring(1, email.length - 1);
}
});
// We need to muck with the internal state of Typeahead in order to update
// its data source
$("#stream").data("typeahead").source = stream_list;
$("#huddle_recipient").data("typeahead").source = huddle_typeahead_list;
autocomplete_needs_update = false;
}
@@ -279,5 +247,46 @@ $(function () {
// but, close enough for now.
resizehandler();
// limit number of items so the list doesn't fall off the screen
$( "#stream" ).typeahead({
source: [], // will be set in update_autocomplete()
items: 3
});
$( "#subject" ).typeahead({
source: function (query, process) {
var stream_name = $("#stream").val();
if (subject_dict.hasOwnProperty(stream_name)) {
return subject_dict[stream_name];
}
return [];
},
items: 2
});
$( "#huddle_recipient" ).typeahead({
source: [], // will be set in update_autocomplete()
items: 4,
matcher: function (item) {
// Assumes email addresses don't have commas or semicolons in them
var current_recipient = $(this.query.split(/[,;] ?/)).last()[0];
// Case-insensitive (from Bootstrap's default matcher).
return (item.toLowerCase().indexOf(current_recipient.toLowerCase()) !== -1);
},
updater: function (item) {
var previous_recipients = this.query.split(/[,;] ?/);
previous_recipients.pop();
previous_recipients = previous_recipients.join(", ");
if (previous_recipients.length !== 0) {
previous_recipients += ", ";
}
// Extracting the email portion via regex is icky, but the Bootstrap
// typeahead widget doesn't seem to be flexible enough to pass
// objects around
var email_re = /<[^<]*>$/;
var email = email_re.exec(item)[0];
return previous_recipients + email.substring(1, email.length - 1);
}
});
update_autocomplete();
});