Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

status_emoji: Remove extra space with Handlebars whitespace control. 

This gets rendered into a comma-separated list, and the extra space
was ending up before the comma.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2024-03-27 13:39:36 -07:00 committed by Tim Abbott
parent f0945518ba
commit 36b8462796
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/templates/status_emoji.hbs
View File

@ -1,12 +1,12 @@
{{#if .}} {{~#if . ~}}
{{#if emoji_alt_code}} {{~#if emoji_alt_code ~}}
<span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span> <span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span>
{{else if still_url}} {{~else if still_url ~}}
<img src="{{still_url}}" class="emoji status-emoji status-emoji-name" data-animated-url="{{url}}" data-still-url="{{still_url}}" data-tippy-content=":{{emoji_name}}:" /> <img src="{{still_url}}" class="emoji status-emoji status-emoji-name" data-animated-url="{{url}}" data-still-url="{{still_url}}" data-tippy-content=":{{emoji_name}}:" />
{{else if url}} {{~else if url ~}}
{{!-- note that we have no still_url --}} {{~!-- note that we have no still_url --~}}
<img src="{{url}}" class="emoji status-emoji status-emoji-name" data-animated-url="{{url}}" data-tippy-content=":{{emoji_name}}:" /> <img src="{{url}}" class="emoji status-emoji status-emoji-name" data-animated-url="{{url}}" data-tippy-content=":{{emoji_name}}:" />
{{else if emoji_name}} {{~else if emoji_name ~}}
<span class="emoji status-emoji status-emoji-name emoji-{{emoji_code}}" data-tippy-content=":{{emoji_name}}:"></span> <span class="emoji status-emoji status-emoji-name emoji-{{emoji_code}}" data-tippy-content=":{{emoji_name}}:"></span>
{{/if}} {{~/if ~}}
{{/if}} {{~/if ~}}

3
web/templates/user_with_status_icon.hbs
View File

@ -1,4 +1,5 @@
<span class="user_status_icon_wrapper"> <span class="user_status_icon_wrapper">
<span class="user-name">{{name}}</span> <span class="user-name">{{name}}</span>
{{> status_emoji status_emoji_info}} {{~> status_emoji status_emoji_info ~}}
</span> </span>
{{~!-- --~}}