emoji: Remove dependence on page_params.

This sets us up to make emoji a leaf module.
This commit is contained in:
Steve Howell
2020-07-23 23:21:48 +00:00
committed by Anders Kaseorg
parent 5280b87f19
commit f5bc454b3a
5 changed files with 16 additions and 13 deletions

View File

@@ -1,8 +1,3 @@
set_global("page_params", {
emojiset: "google",
realm_emoji: {},
});
zrequire("emoji");
run_test("get_canonical_name", () => {

View File

@@ -18,8 +18,7 @@ set_global("location", {
set_global("moment", require("moment-timezone"));
set_global("page_params", {
realm_users: [],
const emoji_params = {
realm_emoji: {
1: {
id: 1,
@@ -28,6 +27,10 @@ set_global("page_params", {
deactivated: false,
},
},
};
set_global("page_params", {
realm_users: [],
realm_filters: [
["#(?P<id>[0-9]{2,8})", "https://trac.example.com/ticket/%(id)s"],
["ZBUG_(?P<id>[0-9]{2,8})", "https://trac2.zulip.net/ticket/%(id)s"],
@@ -43,7 +46,7 @@ function Image() {
return {};
}
set_global("Image", Image);
emoji.initialize();
emoji.initialize(emoji_params);
const doc = "";
set_global("document", doc);

View File

@@ -7,6 +7,9 @@ zrequire("reactions");
set_global("page_params", {
user_id: 5,
});
const emoji_params = {
realm_emoji: {
991: {
id: "991",
@@ -27,9 +30,9 @@ set_global("page_params", {
deactivated: false,
},
},
});
};
emoji.initialize();
emoji.initialize(emoji_params);
set_global("channel", {});
set_global("emoji_picker", {

View File

@@ -133,7 +133,7 @@ exports.update_emojis = function (realm_emojis) {
exports.build_emoji_data(exports.active_realm_emojis);
};
exports.initialize = function initialize() {
exports.initialize = function initialize(params) {
for (const value of emoji_codes.names) {
const base_name = exports.get_emoji_codepoint(value);
@@ -144,7 +144,7 @@ exports.initialize = function initialize() {
}
}
exports.update_emojis(page_params.realm_emoji);
exports.update_emojis(params.realm_emoji);
};
exports.build_emoji_data = function (realm_emojis) {

View File

@@ -394,6 +394,8 @@ exports.initialize_everything = function () {
const alert_words_params = pop_fields("alert_words");
const emoji_params = pop_fields("realm_emoji");
const bot_params = pop_fields("realm_bots");
const people_params = pop_fields("realm_users", "realm_non_active_users", "cross_realm_bots");
@@ -446,7 +448,7 @@ exports.initialize_everything = function () {
bot_data.initialize(bot_params); // Must happen after people.initialize()
message_fetch.initialize();
message_scroll.initialize();
emoji.initialize();
emoji.initialize(emoji_params);
markdown.initialize(page_params.realm_filters, markdown_config.get_helpers());
compose.initialize();
composebox_typeahead.initialize(); // Must happen after compose.initialize()