paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace $.grep with _.filter

Browse Source 
(imported from commit 3a8830f697551a91f94f06b37d01a3687d8c583d)
This commit is contained in:
Scott Feeney
2013-07-29 16:49:42 -04:00
parent d82ccb6243
commit 88952fb2b1
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/composebox_typeahead.js
View File

@@ -22,7 +22,7 @@ function get_pm_recipients(query_string) {
// For example, "a,,b, " => ["a", "b"] // For example, "a,,b, " => ["a", "b"]
exports.get_cleaned_pm_recipients = function (query_string) { exports.get_cleaned_pm_recipients = function (query_string) {
var recipients = get_pm_recipients(query_string); var recipients = get_pm_recipients(query_string);
recipients = $.grep(recipients, function (elem, idx) { recipients = _.filter(recipients, function (elem) {
return elem.match(/\S/); return elem.match(/\S/);
}); });
return recipients; return recipients;

10
static/js/search.js
View File

@@ -148,7 +148,7 @@ function get_stream_suggestions(operators) {
var streams = subs.subscribed_streams(); var streams = subs.subscribed_streams();
streams = $.grep(streams, function (stream) { streams = _.filter(streams, function (stream) {
return stream_matches_query(stream, query); return stream_matches_query(stream, query);
}); });
@@ -200,7 +200,7 @@ function get_private_suggestions(all_people, operators) {
} }
var people = $.grep(all_people, function (person) { var people = _.filter(all_people, function (person) {
return (query === '') || person_matches_query(person, query); return (query === '') || person_matches_query(person, query);
}); });
@@ -229,7 +229,7 @@ function get_person_suggestions(all_people, query, prefix, operator) {
return []; return [];
} }
var people = $.grep(all_people, function (person) { var people = _.filter(all_people, function (person) {
return person_matches_query(person, query); return person_matches_query(person, query);
}); });
@@ -331,7 +331,7 @@ function get_topic_suggestions(query_operators) {
topics = topics.slice(0, 10); topics = topics.slice(0, 10);
if (guess !== '') { if (guess !== '') {
topics = $.grep(topics, function (topic) { topics = _.filter(topics, function (topic) {
return phrase_match(topic, guess); return phrase_match(topic, guess);
}); });
} }
@@ -409,7 +409,7 @@ function get_special_filter_suggestions(query, operators) {
query = query.toLowerCase(); query = query.toLowerCase();
suggestions = $.grep(suggestions, function (s) { suggestions = _.filter(suggestions, function (s) {
if (s.search_string.toLowerCase() === query) { if (s.search_string.toLowerCase() === query) {
return false; // redundant return false; // redundant
} }

2
static/js/stream_list.js
View File

@@ -159,7 +159,7 @@ function rebuild_recent_subjects(stream, subject) {
var stream_li = get_filter_li('stream', stream); var stream_li = get_filter_li('stream', stream);
var subjects = recent_subjects[stream] || []; var subjects = recent_subjects[stream] || [];
var active_orig_subject = subject; var active_orig_subject = subject;
var display_subjects = $.grep(subjects, function (subject_obj, idx) { var display_subjects = _.filter(subjects, function (subject_obj, idx) {
var num_unread = unread.num_unread_for_subject(stream, subject_obj.canon_subject); var num_unread = unread.num_unread_for_subject(stream, subject_obj.canon_subject);
subject_obj.unread = num_unread; subject_obj.unread = num_unread;
subject_obj.is_zero = num_unread === 0; subject_obj.is_zero = num_unread === 0;

2
static/js/ui.js
View File

@@ -1370,7 +1370,7 @@ exports.set_presence_list = function (users, presence_info) {
}; };
} }
var user_emails = $.grep(users, function (email, idx) { var user_emails = _.filter(users, function (email) {
return people_dict[email] !== undefined; return people_dict[email] !== undefined;
}); });

2
static/js/util.js
View File

@@ -219,7 +219,7 @@ exports.normalize_recipients = function (recipients) {
// into a canonical formatting: emails sorted ASCIIbetically // into a canonical formatting: emails sorted ASCIIbetically
// with exactly one comma and no spaces between each. // with exactly one comma and no spaces between each.
recipients = $.map(recipients.split(','), $.trim); recipients = $.map(recipients.split(','), $.trim);
recipients = $.grep(recipients, function (s) { return s.length>0; }); recipients = _.filter(recipients, function (s) { return s.length > 0; });
recipients.sort(); recipients.sort();
return recipients.join(','); return recipients.join(',');
}; };

20
static/js/zephyr.js
View File

@@ -208,8 +208,8 @@ function maybe_scroll_to_selected() {
function get_private_message_recipient(message, attr) { function get_private_message_recipient(message, attr) {
var recipient, i; var recipient, i;
var other_recipients = $.grep(message.display_recipient, var other_recipients = _.filter(message.display_recipient,
function (element, index) { function (element) {
return element.email !== page_params.email; return element.email !== page_params.email;
}); });
if (other_recipients.length === 0) { if (other_recipients.length === 0) {
@@ -246,7 +246,7 @@ function send_queued_flags() {
function on_success(data, status, jqXHR) { function on_success(data, status, jqXHR) {
if (data === undefined || data.messages === undefined) return; if (data === undefined || data.messages === undefined) return;
queued_mark_as_read = $.grep(queued_mark_as_read, function (message, idx) { queued_mark_as_read = _.filter(queued_mark_as_read, function (message) {
return data.messages.indexOf(message) === -1; return data.messages.indexOf(message) === -1;
}); });
} }
@@ -337,7 +337,7 @@ function process_visible_unread_messages(update_cursor) {
} }
var visible_messages = viewport.visible_messages(); var visible_messages = viewport.visible_messages();
var mark_as_read = $.grep(visible_messages, unread.message_unread); var mark_as_read = _.filter(visible_messages, unread.message_unread);
if (mark_as_read.length > 0) { if (mark_as_read.length > 0) {
process_read_messages(mark_as_read); process_read_messages(mark_as_read);
@@ -345,12 +345,12 @@ function process_visible_unread_messages(update_cursor) {
} }
function mark_messages_as_read(msg_list) { function mark_messages_as_read(msg_list) {
var unread_msgs = $.grep(msg_list, unread.message_unread); var unread_msgs = _.filter(msg_list, unread.message_unread);
process_read_messages(unread_msgs); process_read_messages(unread_msgs);
} }
function mark_current_list_as_read() { function mark_current_list_as_read() {
var unread_msgs = $.grep(current_msg_list.all(), unread.message_unread); var unread_msgs = _.filter(current_msg_list.all(), unread.message_unread);
process_read_messages(unread_msgs); process_read_messages(unread_msgs);
} }
@@ -486,7 +486,7 @@ $(function () {
function case_insensitive_find(term, array) { function case_insensitive_find(term, array) {
var lowered_term = term.toLowerCase(); var lowered_term = term.toLowerCase();
return $.grep(array, function (elt) { return _.filter(array, function (elt) {
return elt.toLowerCase() === lowered_term; return elt.toLowerCase() === lowered_term;
}).length !== 0; }).length !== 0;
} }
@@ -501,7 +501,7 @@ function process_message_for_recent_subjects(message, remove_message) {
recent_subjects[canon_stream] = []; recent_subjects[canon_stream] = [];
} else { } else {
recent_subjects[canon_stream] = recent_subjects[canon_stream] =
$.grep(recent_subjects[canon_stream], function (item) { _.filter(recent_subjects[canon_stream], function (item) {
var is_duplicate = (item.canon_subject.toLowerCase() === canon_subject.toLowerCase()); var is_duplicate = (item.canon_subject.toLowerCase() === canon_subject.toLowerCase());
if (is_duplicate) { if (is_duplicate) {
current_timestamp = item.timestamp; current_timestamp = item.timestamp;
@@ -624,7 +624,7 @@ function add_messages_helper(messages, msg_list, predicate, messages_are_new) {
// If we're initially populating the list, save the messages in // If we're initially populating the list, save the messages in
// bottom_messages regardless // bottom_messages regardless
if (msg_list.selected_id() === -1 && msg_list.empty()) { if (msg_list.selected_id() === -1 && msg_list.empty()) {
bottom_messages = $.grep(messages, predicate); bottom_messages = _.filter(messages, predicate);
} else { } else {
$.each(messages, function (idx, msg) { $.each(messages, function (idx, msg) {
// Filter out duplicates that are already in msg_list, and all messages // Filter out duplicates that are already in msg_list, and all messages
@@ -682,7 +682,7 @@ function add_messages(messages, msg_list, messages_are_new) {
function deduplicate_messages(messages) { function deduplicate_messages(messages) {
var new_message_ids = {}; var new_message_ids = {};
return $.grep(messages, function (msg, idx) { return _.filter(messages, function (msg) {
if (new_message_ids[msg.id] === undefined if (new_message_ids[msg.id] === undefined
&& all_msg_list.get(msg.id) === undefined) && all_msg_list.get(msg.id) === undefined)
{ {