Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Search aliases but don't add them to the results

This commit is contained in:
Robin Ward 2016-03-04 16:08:17 -05:00
parent 396713718b
commit 0a96829508
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
View File

@ -48,9 +48,11 @@ var emojiHash = {};
// add all default emojis
emoji.forEach(function(code){ emojiHash[code] = true; });
// and their aliases
var aliasHash = {};
for (var name in aliases) {
aliases[name].forEach(function(alias) {
emojiHash[alias] = true;
aliasHash[alias] = name;
});
}
@ -221,27 +223,29 @@ Discourse.Emoji.search = function(term, options) {
var maxResults = (options && options["maxResults"]) || -1;
if (maxResults === 0) { return []; }
toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji)).sort();
toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji), _.keys(aliasHash)).sort();
var i, results = [];
var done = function() {
function addResult(term) {
var val = aliasHash[term] || term;
if (results.indexOf(val) === -1) {
results.push(val);
}
return maxResults > 0 && results.length >= maxResults;
}
for (i=0; i < toSearch.length; i++) {
if (toSearch[i].indexOf(term) === 0) {
results.push(toSearch[i]);
if(done()) { break; }
var item;
for (i=0; i<toSearch.length; i++) {
item = toSearch[i];
if (item.indexOf(term) === 0 && addResult(item)) {
return results;
}
}
if(!done()){
for (i=0; i < toSearch.length; i++) {
if (toSearch[i].indexOf(term) > 0) {
results.push(toSearch[i]);
if(done()) { break; }
}
for (i=0; i<toSearch.length; i++) {
item = toSearch[i];
if (item.indexOf(term) === 0 && addResult(item)) {
return results;
}
}