paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

copy: Fix copy-pasting of EDITED notices in messages.

Browse Source 
Previously, because the parens were added via CSS, copy-pasting the
EDITED notices resulted in junk like this:

 Iago 3:51 PMEDITED
edited message content

Now, you get:

 Iago 3:51 PM (EDITED)
edited message content
This commit is contained in:
Tim Abbott
2018-11-27 16:20:17 -08:00
parent e159f052bb
commit 3ef0d6016c
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/styles/zulip.scss
View File

@@ -628,14 +628,6 @@ td.pointer {
@include prefixed-user-select(none); @include prefixed-user-select(none);
} }
.include-sender .message_edit_notice::before {
content: "(";
}
.include-sender .message_edit_notice::after {
content: ")";
}
.include-sender .message_time { .include-sender .message_time {
top: -4px; top: -4px;
} }

12
static/templates/single_message.handlebars
View File

@@ -23,7 +23,9 @@
{{{ status_message }}} {{{ status_message }}}
</span> </span>
{{#if_and last_edit_timestr include_sender}} {{#if_and last_edit_timestr include_sender}}
<div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">{{t "EDITED" }}</div> <div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
({{t "EDITED" }})
</div>
{{/if_and}} {{/if_and}}
</span> </span>
{{else}} {{else}}
@@ -38,7 +40,9 @@
<span class="message_time{{#if msg.locally_echoed}} notvisible{{/if}}{{#if status_message}} status-time{{/if}}">{{timestr}}</span> <span class="message_time{{#if msg.locally_echoed}} notvisible{{/if}}{{#if status_message}} status-time{{/if}}">{{timestr}}</span>
{{#if_and last_edit_timestr include_sender}} {{#if_and last_edit_timestr include_sender}}
{{#unless status_message}} {{#unless status_message}}
<div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">{{t "EDITED" }}</div> <div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
({{t "EDITED" }})
</div>
{{/unless}} {{/unless}}
{{/if_and}} {{/if_and}}
<div class="message_controls{{#status_message}} sender-status-controls{{/status_message}} no-select"> <div class="message_controls{{#status_message}} sender-status-controls{{/status_message}} no-select">
@@ -71,7 +75,9 @@
<div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div> <div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div>
{{#if last_edit_timestr}} {{#if last_edit_timestr}}
{{#unless include_sender}} {{#unless include_sender}}
<div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">{{t "EDITED" }}</div> <div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
({{t "EDITED" }})
</div>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
<div class="message_edit"> <div class="message_edit">