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

Extract filter_term() in filter.js

Browse Source 
(imported from commit 142464bb02817108726f9c118459c38e55b96bbf)
This commit is contained in:
Steve Howell
2014-01-29 16:39:05 -05:00
parent abbe0f781f
commit fdd57f5abe
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/filter.js
View File

@@ -1,5 +1,15 @@
var Filter = (function () { var Filter = (function () {
function filter_term(operator, operand) {
// For legacy reasons we must represent filter_terms as tuples
// until we phase out all the code that assumes tuples.
var term = [];
term[0] = operator;
term[1] = operand;
return term;
}
function mit_edu_stream_name_match(message, operand) { function mit_edu_stream_name_match(message, operand) {
// MIT users expect narrowing to "social" to also show messages to /^(un)*social(.d)*$/ // MIT users expect narrowing to "social" to also show messages to /^(un)*social(.d)*$/
// (unsocial, ununsocial, social.d, etc) // (unsocial, ununsocial, social.d, etc)
@@ -117,6 +127,8 @@ function decodeOperand(encoded, operator) {
Filter.parse = function (str) { Filter.parse = function (str) {
var operators = []; var operators = [];
var search_term = []; var search_term = [];
var operand;
var matches = str.match(/"[^"]+"|\S+/g); var matches = str.match(/"[^"]+"|\S+/g);
if (matches === null) { if (matches === null) {
return operators; return operators;
@@ -131,12 +143,14 @@ Filter.parse = function (str) {
// Looks like an operator. // Looks like an operator.
// FIXME: Should we skip unknown operator names here? // FIXME: Should we skip unknown operator names here?
operator = parts.shift(); operator = parts.shift();
operators.push([operator, decodeOperand(parts.join(':'), operator)]); operand = decodeOperand(parts.join(':'), operator);
operators.push(filter_term(operator, operand));
} }
}); });
// NB: Callers of 'parse' can assume that the 'search' operator is last. // NB: Callers of 'parse' can assume that the 'search' operator is last.
if (search_term.length > 0) { if (search_term.length > 0) {
operators.push(['search', search_term.join(' ')]); operand = search_term.join(' ');
operators.push(filter_term('search', operand));
} }
return operators; return operators;
}; };