mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 14:03:30 +00:00
typeahead: Rename codepoint to emoji_code.
This commit is contained in:
committed by
Tim Abbott
parent
4251543426
commit
f8f971bfd6
@@ -34,52 +34,52 @@ blueslip.warn = noop;
|
|||||||
var emoji_stadium = {
|
var emoji_stadium = {
|
||||||
emoji_name: 'stadium',
|
emoji_name: 'stadium',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f3df',
|
emoji_code: '1f3df',
|
||||||
};
|
};
|
||||||
var emoji_tada = {
|
var emoji_tada = {
|
||||||
emoji_name: 'tada',
|
emoji_name: 'tada',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f389',
|
emoji_code: '1f389',
|
||||||
};
|
};
|
||||||
var emoji_moneybag = {
|
var emoji_moneybag = {
|
||||||
emoji_name: 'moneybag',
|
emoji_name: 'moneybag',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f4b0',
|
emoji_code: '1f4b0',
|
||||||
};
|
};
|
||||||
var emoji_japanese_post_office = {
|
var emoji_japanese_post_office = {
|
||||||
emoji_name: 'japanese_post_office',
|
emoji_name: 'japanese_post_office',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f3e3',
|
emoji_code: '1f3e3',
|
||||||
};
|
};
|
||||||
var emoji_panda_face = {
|
var emoji_panda_face = {
|
||||||
emoji_name: 'panda_face',
|
emoji_name: 'panda_face',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f43c',
|
emoji_code: '1f43c',
|
||||||
};
|
};
|
||||||
var emoji_see_no_evil = {
|
var emoji_see_no_evil = {
|
||||||
emoji_name: 'see_no_evil',
|
emoji_name: 'see_no_evil',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f648',
|
emoji_code: '1f648',
|
||||||
};
|
};
|
||||||
var emoji_thumbs_up = {
|
var emoji_thumbs_up = {
|
||||||
emoji_name: 'thumbs_up',
|
emoji_name: 'thumbs_up',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f44d',
|
emoji_code: '1f44d',
|
||||||
};
|
};
|
||||||
var emoji_thermometer = {
|
var emoji_thermometer = {
|
||||||
emoji_name: 'thermometer',
|
emoji_name: 'thermometer',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f321',
|
emoji_code: '1f321',
|
||||||
};
|
};
|
||||||
var emoji_heart = {
|
var emoji_heart = {
|
||||||
emoji_name: 'heart',
|
emoji_name: 'heart',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '2764',
|
emoji_code: '2764',
|
||||||
};
|
};
|
||||||
var emoji_headphones = {
|
var emoji_headphones = {
|
||||||
emoji_name: 'headphones',
|
emoji_name: 'headphones',
|
||||||
emoji_url: 'TBD',
|
emoji_url: 'TBD',
|
||||||
codepoint: '1f3a7',
|
emoji_code: '1f3a7',
|
||||||
};
|
};
|
||||||
|
|
||||||
var emoji_list = [emoji_tada, emoji_moneybag, emoji_stadium, emoji_japanese_post_office,
|
var emoji_list = [emoji_tada, emoji_moneybag, emoji_stadium, emoji_japanese_post_office,
|
||||||
@@ -1245,14 +1245,14 @@ run_test('typeahead_results', () => {
|
|||||||
assert.deepEqual(returned, expected);
|
assert.deepEqual(returned, expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_emoji_matches('da', [{emoji_name: "tada", emoji_url: "TBD", codepoint: "1f389"},
|
assert_emoji_matches('da', [{emoji_name: "tada", emoji_url: "TBD", emoji_code: "1f389"},
|
||||||
{emoji_name: "panda_face", emoji_url: "TBD", codepoint: "1f43c"}]);
|
{emoji_name: "panda_face", emoji_url: "TBD", emoji_code: "1f43c"}]);
|
||||||
assert_emoji_matches('da_', []);
|
assert_emoji_matches('da_', []);
|
||||||
assert_emoji_matches('da ', []);
|
assert_emoji_matches('da ', []);
|
||||||
assert_emoji_matches('panda ', [{emoji_name: "panda_face", emoji_url: "TBD", codepoint: "1f43c"}]);
|
assert_emoji_matches('panda ', [{emoji_name: "panda_face", emoji_url: "TBD", emoji_code: "1f43c"}]);
|
||||||
assert_emoji_matches('panda_', [{emoji_name: "panda_face", emoji_url: "TBD", codepoint: "1f43c"}]);
|
assert_emoji_matches('panda_', [{emoji_name: "panda_face", emoji_url: "TBD", emoji_code: "1f43c"}]);
|
||||||
assert_emoji_matches('japanese_post_', [{emoji_name: "japanese_post_office", emoji_url: "TBD", codepoint: "1f3e3"}]);
|
assert_emoji_matches('japanese_post_', [{emoji_name: "japanese_post_office", emoji_url: "TBD", emoji_code: "1f3e3"}]);
|
||||||
assert_emoji_matches('japanese post ', [{emoji_name: "japanese_post_office", emoji_url: "TBD", codepoint: "1f3e3"}]);
|
assert_emoji_matches('japanese post ', [{emoji_name: "japanese_post_office", emoji_url: "TBD", emoji_code: "1f3e3"}]);
|
||||||
assert_emoji_matches('notaemoji', []);
|
assert_emoji_matches('notaemoji', []);
|
||||||
// Autocomplete user mentions by user name.
|
// Autocomplete user mentions by user name.
|
||||||
assert_mentions_matches('cordelia', [cordelia]);
|
assert_mentions_matches('cordelia', [cordelia]);
|
||||||
|
|||||||
@@ -500,7 +500,7 @@ run_test('render_emoji', () => {
|
|||||||
var rendered = false;
|
var rendered = false;
|
||||||
var test_emoji = {
|
var test_emoji = {
|
||||||
emoji_name: 'thumbs_up',
|
emoji_name: 'thumbs_up',
|
||||||
codepoint: '1f44d',
|
emoji_code: '1f44d',
|
||||||
};
|
};
|
||||||
emoji.active_realm_emojis = {
|
emoji.active_realm_emojis = {
|
||||||
realm_emoji: 'TBD',
|
realm_emoji: 'TBD',
|
||||||
@@ -510,7 +510,7 @@ run_test('render_emoji', () => {
|
|||||||
assert.equal(template_name, 'typeahead_list_item');
|
assert.equal(template_name, 'typeahead_list_item');
|
||||||
assert.deepEqual(args, {
|
assert.deepEqual(args, {
|
||||||
primary: 'thumbs up',
|
primary: 'thumbs up',
|
||||||
codepoint: '1f44d',
|
emoji_code: '1f44d',
|
||||||
is_emoji: true,
|
is_emoji: true,
|
||||||
has_image: false,
|
has_image: false,
|
||||||
has_secondary: false,
|
has_secondary: false,
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ exports.initialize = function initialize() {
|
|||||||
_.each(emoji_codes.names, function (value) {
|
_.each(emoji_codes.names, function (value) {
|
||||||
var base_name = emoji_codes.name_to_codepoint[value];
|
var base_name = emoji_codes.name_to_codepoint[value];
|
||||||
default_emojis.push({emoji_name: value,
|
default_emojis.push({emoji_name: value,
|
||||||
codepoint: emoji_codes.name_to_codepoint[value]});
|
emoji_code: emoji_codes.name_to_codepoint[value]});
|
||||||
|
|
||||||
if (exports.default_emoji_aliases.hasOwnProperty(base_name)) {
|
if (exports.default_emoji_aliases.hasOwnProperty(base_name)) {
|
||||||
exports.default_emoji_aliases[base_name].push(value);
|
exports.default_emoji_aliases[base_name].push(value);
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ exports.render_emoji = function (item) {
|
|||||||
if (emoji.active_realm_emojis.hasOwnProperty(item.emoji_name)) {
|
if (emoji.active_realm_emojis.hasOwnProperty(item.emoji_name)) {
|
||||||
args.img_src = item.emoji_url;
|
args.img_src = item.emoji_url;
|
||||||
} else {
|
} else {
|
||||||
args.codepoint = item.codepoint;
|
args.emoji_code = item.emoji_code;
|
||||||
}
|
}
|
||||||
return exports.render_typeahead_item(args);
|
return exports.render_typeahead_item(args);
|
||||||
};
|
};
|
||||||
@@ -168,7 +168,7 @@ function emoji_prefix_sort(query, objs, get_item) {
|
|||||||
var popular_emoji_matches = [];
|
var popular_emoji_matches = [];
|
||||||
var other_emoji_matches = [];
|
var other_emoji_matches = [];
|
||||||
prefix_sort.matches.forEach(function (obj) {
|
prefix_sort.matches.forEach(function (obj) {
|
||||||
if (emoji.frequently_used_emojis_list.indexOf(obj.codepoint) !== -1) {
|
if (emoji.frequently_used_emojis_list.indexOf(obj.emoji_code) !== -1) {
|
||||||
popular_emoji_matches.push(obj);
|
popular_emoji_matches.push(obj);
|
||||||
} else {
|
} else {
|
||||||
other_emoji_matches.push(obj);
|
other_emoji_matches.push(obj);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
{{#if has_image}}
|
{{#if has_image}}
|
||||||
<img class="emoji" src="{{ img_src }}" />
|
<img class="emoji" src="{{ img_src }}" />
|
||||||
{{else}}
|
{{else}}
|
||||||
<span class='emoji emoji-{{ codepoint }}' />
|
<span class='emoji emoji-{{ emoji_code }}' />
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{else}}
|
{{else}}
|
||||||
|
|||||||
Reference in New Issue
Block a user