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

Rewrite private_message_typeahead so it has access to the people_list objects. 

(imported from commit 3772fb2db9db96947555d30ad923edbde3127b3f)
This commit is contained in:
Waseem Daher 2012-11-18 16:04:47 -05:00
parent 31c4cf96d2
commit f9130369f2
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
zephyr/static/js/composebox_typeahead.js
View File

@ -24,6 +24,11 @@ exports.autocomplete_needs_update = function (needs_update) {
}; };
var private_message_typeahead_list = []; var private_message_typeahead_list = [];
var private_message_mapped = {};
function render_pm_object(person) {
return person.full_name + " <" + person.email + ">";
}
exports.update_autocomplete = function () { exports.update_autocomplete = function () {
stream_list.sort(); stream_list.sort();
@ -33,8 +38,12 @@ exports.update_autocomplete = function () {
return 1; return 1;
}); });
private_message_typeahead_list = $.map(people_list, function (person) { private_message_mapped = {};
return person.full_name + " <" + person.email + ">"; private_message_typeahead_list = [];
$.each(people_list, function (i, obj) {
var label = render_pm_object(obj);
private_message_mapped[label] = obj;
private_message_typeahead_list.push(label);
}); });
autocomplete_needs_update = false; autocomplete_needs_update = false;
@ -122,14 +131,6 @@ function select_on_focus(field_id) {
}); });
} }
exports.extract_name_and_email = function(name_and_email) {
var email_re = /<[^<]*>$/;
var email_with_brackets = email_re.exec(name_and_email)[0];
var their_name = name_and_email.substr(0, name_and_email.indexOf(email_with_brackets) - 1); // -1 for the space between the name & email.
var their_email = email_with_brackets.substring(1, email_with_brackets.length - 1); // Remove <>s.
return {name: their_name, email: their_email};
};
exports.initialize = function () { exports.initialize = function () {
select_on_focus("stream"); select_on_focus("stream");
select_on_focus("subject"); select_on_focus("subject");
@ -163,6 +164,7 @@ exports.initialize = function () {
items: 3, items: 3,
highlighter: composebox_typeahead_highlighter highlighter: composebox_typeahead_highlighter
}); });
$( "#private_message_recipient" ).typeahead({ $( "#private_message_recipient" ).typeahead({
source: function (query, process) { source: function (query, process) {
return private_message_typeahead_list; return private_message_typeahead_list;
@ -180,17 +182,14 @@ exports.initialize = function () {
return (item.toLowerCase().indexOf(current_recipient.toLowerCase()) !== -1); return (item.toLowerCase().indexOf(current_recipient.toLowerCase()) !== -1);
}, },
updater: function (item) { updater: function (item) {
var obj = private_message_mapped[item];
var previous_recipients = get_cleaned_pm_recipients(this.query); var previous_recipients = get_cleaned_pm_recipients(this.query);
previous_recipients.pop(); previous_recipients.pop();
previous_recipients = previous_recipients.join(", "); previous_recipients = previous_recipients.join(", ");
if (previous_recipients.length !== 0) { if (previous_recipients.length !== 0) {
previous_recipients += ", "; previous_recipients += ", ";
} }
// Extracting the email portion via regex is icky, but the Bootstrap return previous_recipients + obj.email + ", ";
// typeahead widget doesn't seem to be flexible enough to pass
// objects around
var name_and_email = exports.extract_name_and_email(item);
return previous_recipients + name_and_email.email + ", ";
}, },
stopAdvance: true // Do not advance to the next field on a tab or enter stopAdvance: true // Do not advance to the next field on a tab or enter
}); });