paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 11:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_card_popover: Rename Handlebars templates.

Browse Source 
List of renamed templates:
`user_info_popover_content` -> `user_card_popover_content`
`user_info_popover_manage_menu` -> `user_card_popover_manage_menu`
`user_info_popover_title` -> `user_card_popover_title`
This commit is contained in:
Daniil Fadeev
2023-09-14 19:22:00 +04:00
committed by Tim Abbott
parent d862cae3e4
commit d89cd1e241
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/linter_lib/custom_check.py
View File

@@ -695,7 +695,7 @@ html_rules: List["Rule"] = [
"templates/corporate/billing.html", "templates/corporate/billing.html",
"templates/corporate/upgrade.html", "templates/corporate/upgrade.html",
# Miscellaneous violations to be cleaned up # Miscellaneous violations to be cleaned up
"web/templates/user_info_popover_title.hbs", "web/templates/user_card_popover_title.hbs",
"web/templates/confirm_dialog/confirm_subscription_invites_warning.hbs", "web/templates/confirm_dialog/confirm_subscription_invites_warning.hbs",
"templates/zerver/reset_confirm.html", "templates/zerver/reset_confirm.html",
"templates/zerver/config_error.html", "templates/zerver/config_error.html",

12
web/src/user_card_popover.js
View File

@@ -4,9 +4,9 @@ import $ from "jquery";
import tippy from "tippy.js"; import tippy from "tippy.js";
import render_no_arrow_popover from "../templates/no_arrow_popover.hbs"; import render_no_arrow_popover from "../templates/no_arrow_popover.hbs";
import render_user_info_popover_content from "../templates/user_info_popover_content.hbs"; import render_user_card_popover_content from "../templates/user_card_popover_content.hbs";
import render_user_info_popover_manage_menu from "../templates/user_info_popover_manage_menu.hbs"; import render_user_card_popover_manage_menu from "../templates/user_card_popover_manage_menu.hbs";
import render_user_info_popover_title from "../templates/user_info_popover_title.hbs"; import render_user_card_popover_title from "../templates/user_card_popover_title.hbs";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
import * as buddy_data from "./buddy_data"; import * as buddy_data from "./buddy_data";
@@ -224,13 +224,13 @@ function render_user_info_popover(
private_msg_class, private_msg_class,
); );
const $popover_content = $(render_user_info_popover_content(args)); const $popover_content = $(render_user_card_popover_content(args));
popover_element.popover({ popover_element.popover({
content: $popover_content.get(0), content: $popover_content.get(0),
fixed: true, fixed: true,
placement: popover_placement, placement: popover_placement,
template: render_no_arrow_popover({class: template_class}), template: render_no_arrow_popover({class: template_class}),
title: render_user_info_popover_title({ title: render_user_card_popover_title({
// See the load_medium_avatar comment for important background. // See the load_medium_avatar comment for important background.
user_avatar: people.small_avatar_url_for_person(user), user_avatar: people.small_avatar_url_for_person(user),
user_is_guest: user.is_guest, user_is_guest: user.is_guest,
@@ -363,7 +363,7 @@ function toggle_user_info_popover_manage_menu(element, user) {
const $popover_elt = $(element); const $popover_elt = $(element);
$popover_elt.popover({ $popover_elt.popover({
content: render_user_info_popover_manage_menu(args), content: render_user_card_popover_manage_menu(args),
placement: "bottom", placement: "bottom",
html: true, html: true,
trigger: "manual", trigger: "manual",

0
web/templates/user_info_popover_content.hbs → web/templates/user_card_popover_content.hbs
View File

0
web/templates/user_info_popover_manage_menu.hbs → web/templates/user_card_popover_manage_menu.hbs
View File

0
web/templates/user_info_popover_title.hbs → web/templates/user_card_popover_title.hbs
View File

4
web/tests/user_card_popover.test.js
View File

@@ -153,7 +153,7 @@ test_ui("sender_hover", ({override, mock_template}) => {
return "popover-html"; return "popover-html";
}); });
mock_template("user_info_popover_title.hbs", false, (opts) => { mock_template("user_card_popover_title.hbs", false, (opts) => {
assert.deepEqual(opts, { assert.deepEqual(opts, {
user_avatar: "http://zulip.zulipdev.com/avatar/42?s=50", user_avatar: "http://zulip.zulipdev.com/avatar/42?s=50",
user_is_guest: false, user_is_guest: false,
@@ -161,7 +161,7 @@ test_ui("sender_hover", ({override, mock_template}) => {
return "title-html"; return "title-html";
}); });
const $popover_content = $.create("content-html"); const $popover_content = $.create("content-html");
mock_template("user_info_popover_content.hbs", false, (opts) => { mock_template("user_card_popover_content.hbs", false, (opts) => {
assert.deepEqual(opts, { assert.deepEqual(opts, {
invisible_mode: false, invisible_mode: false,
can_send_private_message: true, can_send_private_message: true,