paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

web: Convert uses of deprecated text-field-edit function aliases.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-02-29 13:21:25 -08:00
parent d66b7ad853
commit 1118b2cc19
3 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
web/src/compose_ui.ts
View File

@@ -3,7 +3,12 @@
import autosize from "autosize";
import $ from "jquery";
import {insert, replace, set, wrapSelection} from "text-field-edit";
import {
insertTextIntoField,
replaceFieldText,
setFieldText,
wrapFieldSelection,
} from "text-field-edit";
import * as bulleted_numbered_list_util from "./bulleted_numbered_list_util";
import * as common from "./common";
@@ -64,7 +69,7 @@ export function insert_and_scroll_into_view(
content: string,
$textarea: JQuery<HTMLTextAreaElement>,
): void {
insert($textarea[0], content);
insertTextIntoField($textarea[0], content);
// Blurring and refocusing ensures the cursor / selection is in view.
$textarea.trigger("blur");
$textarea.trigger("focus");
@@ -237,7 +242,7 @@ export function replace_syntax(
// for details.
const old_text = $textarea.val();
replace($textarea[0], old_syntax, () => new_syntax, "after-replacement");
replaceFieldText($textarea[0], old_syntax, () => new_syntax, "after-replacement");
const new_text = $textarea.val();
// When replacing content in a textarea, we need to move the cursor
@@ -558,7 +563,7 @@ export function format_text(
after_lines = "\n" + after_lines;
}
text = before_lines + selected_lines + after_lines;
set(field, text);
setFieldText(field, text);
// If no text was selected, that is, marking was added to the line with the
// cursor, nothing will be selected and the cursor will remain as it was.
if (selected_text === "") {
@@ -590,7 +595,7 @@ export function format_text(
text.slice(range.start, range.end) +
linebreak_end +
text.slice(range.end + syntax_end.length);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start - syntax_start.length,
range.end - syntax_start.length,
@@ -604,7 +609,7 @@ export function format_text(
text.slice(range.start + syntax_start.length, range.end - syntax_end.length) +
linebreak_end +
text.slice(range.end);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start,
range.end - syntax_start.length - syntax_end.length,
@@ -613,7 +618,7 @@ export function format_text(
}
// Otherwise, we don't have syntax within or around, so we add it.
wrapSelection(field, syntax_start, syntax_end);
wrapFieldSelection(field, syntax_start, syntax_end);
};
const format_spoiler = (): void => {
@@ -633,7 +638,7 @@ export function format_text(
if (text.startsWith("\n")) {
text = text.slice(1);
}
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start,
range.end - spoiler_syntax_start.length - spoiler_syntax_end.length,
@@ -653,7 +658,7 @@ export function format_text(
if (text.startsWith("\n")) {
text = text.slice(1);
}
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start,
range.end - spoiler_syntax_start_without_break.length - spoiler_syntax_end.length,
@@ -667,7 +672,7 @@ export function format_text(
text.slice(0, range.start - spoiler_syntax_start_without_break.length) +
selected_text +
text.slice(range.end + spoiler_syntax_end.length);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start - spoiler_syntax_start_without_break.length,
range.end - spoiler_syntax_start_without_break.length,
@@ -681,7 +686,7 @@ export function format_text(
text.slice(0, range.start - spoiler_syntax_start.length) +
selected_text +
text.slice(range.end + spoiler_syntax_end.length);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start - spoiler_syntax_start.length,
range.end - spoiler_syntax_start.length,
@@ -711,7 +716,7 @@ export function format_text(
) +
selected_text +
text.slice(range.end + spoiler_syntax_end.length);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
new_selection_start,
range.end - spoiler_syntax_start_without_break.length,
@@ -735,7 +740,7 @@ export function format_text(
text.slice(0, range.start - spoiler_syntax_start_without_break.length) +
text.slice(new_range_start, new_range_end) +
text.slice(new_range_end + spoiler_syntax_end.length);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
new_range_start - spoiler_syntax_start_without_break.length - (header ? 0 : 1),
new_range_end - spoiler_syntax_start_without_break.length - (header ? 0 : 1),
@@ -753,7 +758,7 @@ export function format_text(
const spoiler_syntax_start_with_header = spoiler_syntax_start_without_break + "Header\n";
// Otherwise, we don't have spoiler syntax, so we add it.
wrapSelection(field, spoiler_syntax_start_with_header, spoiler_syntax_end);
wrapFieldSelection(field, spoiler_syntax_start_with_header, spoiler_syntax_end);
field.setSelectionRange(
range.start + spoiler_syntax_start_without_break.length,
@@ -802,7 +807,7 @@ export function format_text(
space_between_description_and_url(description, url) +
url +
text.slice(range.end + 1);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start - 3 + space_between_description_and_url(description, url).length,
range.start -
@@ -835,7 +840,7 @@ export function format_text(
space_between_description_and_url(selected_text, url) +
url +
text.slice(text.indexOf(")", range.end) + 1);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(range.start - 1, range.end - 1);
return;
}
@@ -859,7 +864,7 @@ export function format_text(
space_between_description_and_url(description, url) +
url +
text.slice(range.end);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start,
range.start +
@@ -871,7 +876,7 @@ export function format_text(
}
// Otherwise, we don't have link syntax, so we add it.
wrapSelection(field, link_syntax_start, link_syntax_end);
wrapFieldSelection(field, link_syntax_start, link_syntax_end);
// Highlight the new `url` part of the syntax.
// If <text> marks the selected region, we're mapping:
@@ -929,7 +934,7 @@ export function format_text(
text.slice(0, range.start - italic_syntax.length) +
text.slice(range.start, range.end) +
text.slice(range.end + italic_syntax.length);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(
range.start - italic_syntax.length,
range.end - italic_syntax.length,
@@ -965,12 +970,12 @@ export function format_text(
range.end - italic_syntax.length,
) +
text.slice(range.end);
set(field, text);
setFieldText(field, text);
field.setSelectionRange(range.start, range.end - italic_syntax.length * 2);
break;
}
wrapSelection(field, italic_syntax);
wrapFieldSelection(field, italic_syntax);
break;
case "bulleted":
case "numbered":
@@ -1012,7 +1017,7 @@ export function format_text(
}
case "linked": {
// From a paste event with a URL as inserted content
wrapSelection(field, "[", `](${inserted_content})`);
wrapFieldSelection(field, "[", `](${inserted_content})`);
// Put the cursor at the end of the selection range
// and all wrapped material
$textarea.caret(range.end + `[](${inserted_content})`.length);