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

copy-paste: Separate intial_end_tr logic into its own function.

Browse Source 
Creates a new function get_end_tr_from_endc. This will make it
easier to add more logic to this function to fix a bug (#22350).
This commit is contained in:
evykassirer
2022-08-12 21:15:42 -07:00
committed by Tim Abbott
parent 358416349e
commit 96b2e18b0d
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
static/js/copy_and_paste.js
View File

@@ -232,16 +232,7 @@ export function analyze_selection(selection) {
}
$endc = $(range.endContainer);
// If the selection ends in the bottom whitespace, we should
// act as though the selection ends on the final message.
// This handles the issue that Chrome seems to like selecting
// the compose_close button when you go off the end of the
// last message
if ($endc.attr("id") === "bottom_whitespace" || $endc.attr("id") === "compose_close") {
$initial_end_tr = $(".message_row").last();
} else {
$initial_end_tr = $($endc.parents(".selectable_row")[0]);
}
$initial_end_tr = get_end_tr_from_endc($endc);
end_data = find_boundary_tr($initial_end_tr, ($row) => $row.prev());
if (end_data === undefined) {
@@ -267,6 +258,19 @@ export function analyze_selection(selection) {
};
}
function get_end_tr_from_endc($endc) {
if ($endc.attr("id") === "bottom_whitespace" || $endc.attr("id") === "compose_close") {
// If the selection ends in the bottom whitespace, we should
// act as though the selection ends on the final message.
// This handles the issue that Chrome seems to like selecting
// the compose_close button when you go off the end of the
// last message
return $(".message_row").last();
}
return $($endc.parents(".selectable_row")[0]);
}
export function paste_handler_converter(paste_html) {
const turndownService = new TurndownService();
turndownService.addRule("headings", {