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

Break emoji_picker dependency inside util.js.

Browse Source 
We don't need util.js to be depending on emoji_picker.js.

The function emoji_prefix_sort is only used
in typeahead_helper, so I just moved the implemenation
to there.
This commit is contained in:
Steve Howell
2018-08-04 12:30:56 +00:00
committed by Tim Abbott
parent c7ab3884c6
commit 95490e98c9
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/typeahead_helper.js
View File

@@ -161,6 +161,22 @@ exports.render_emoji = function (item) {
return exports.render_typeahead_item(args);
};
// manipulate prefix_sort to select popular emojis first
// This is kinda a hack and so probably not our long-term solution.
function emoji_prefix_sort(query, objs, get_item) {
var prefix_sort = util.prefix_sort(query, objs, get_item);
var popular_emoji_matches = [];
var other_emoji_matches = [];
prefix_sort.matches.forEach(function (obj) {
if (emoji_picker.frequently_used_emojis_list.indexOf(obj.codepoint) !== -1) {
popular_emoji_matches.push(obj);
} else {
other_emoji_matches.push(obj);
}
});
return { matches: popular_emoji_matches.concat(other_emoji_matches), rest: prefix_sort.rest };
}
exports.sorter = function (query, objs, get_item) {
var results = util.prefix_sort(query, objs, get_item);
return results.matches.concat(results.rest);
@@ -315,7 +331,7 @@ exports.sort_recipients = function (users, query, current_stream, current_subjec
exports.sort_emojis = function (matches, query) {
// TODO: sort by category in v2
var results = util.emoji_prefix_sort(query, matches, function (x) { return x.emoji_name; });
var results = emoji_prefix_sort(query, matches, function (x) { return x.emoji_name; });
return results.matches.concat(results.rest);
};

16
static/js/util.js
View File

@@ -256,22 +256,6 @@ exports.prefix_sort = function (query, objs, get_item) {
};
};
// manipulate prefix_sort to select popular emojis first
// This is kinda a hack and so probably not our long-term solution.
exports.emoji_prefix_sort = function (query, objs, get_item) {
var prefix_sort = exports.prefix_sort(query, objs, get_item);
var popular_emoji_matches = [];
var other_emoji_matches = [];
prefix_sort.matches.forEach(function (obj) {
if (emoji_picker.frequently_used_emojis_list.indexOf(obj.codepoint) !== -1) {
popular_emoji_matches.push(obj);
} else {
other_emoji_matches.push(obj);
}
});
return { matches: popular_emoji_matches.concat(other_emoji_matches), rest: prefix_sort.rest };
};
function to_int(s) {
return parseInt(s, 10);
}