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

compose_ui: Use startsWith/endsWith helpers. 

Suggested by @joydeep2001 in #28725.
This commit is contained in:
Tim Abbott 2024-02-09 14:20:55 -08:00
parent 9efce0b16c
commit 91bdcc9596
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/compose_ui.js
View File

@ -419,8 +419,8 @@ export function format_text($textarea, type, inserted_content) {
// Check if selected text itself has syntax inside it. // Check if selected text itself has syntax inside it.
const is_inner_text_formatted = (syntax_start, syntax_end = syntax_start) => const is_inner_text_formatted = (syntax_start, syntax_end = syntax_start) =>
range.length >= syntax_start.length + syntax_end.length && range.length >= syntax_start.length + syntax_end.length &&
selected_text.slice(0, syntax_start.length) === syntax_start && selected_text.startsWith(syntax_start) &&
selected_text.slice(-syntax_end.length) === syntax_end; selected_text.endsWith(syntax_end);
const section_off_selected_lines = () => { const section_off_selected_lines = () => {
// Divide all lines of text (separated by `\n`) into those entirely or // Divide all lines of text (separated by `\n`) into those entirely or
@ -539,10 +539,10 @@ export function format_text($textarea, type, inserted_content) {
const format = (syntax_start, syntax_end = syntax_start) => { const format = (syntax_start, syntax_end = syntax_start) => {
let linebreak_start = ""; let linebreak_start = "";
let linebreak_end = ""; let linebreak_end = "";
if (syntax_start[0] === "\n") { if (syntax_start.startsWith("\n")) {
linebreak_start = "\n"; linebreak_start = "\n";
} }
if (syntax_end.at(-1) === "\n") { if (syntax_end.endsWith("\n")) {
linebreak_end = "\n"; linebreak_end = "\n";
} }
if (is_selection_formatted(syntax_start, syntax_end)) { if (is_selection_formatted(syntax_start, syntax_end)) {
@ -900,16 +900,14 @@ export function format_text($textarea, type, inserted_content) {
} else if ( } else if (
selected_text.length > italic_syntax.length * 2 && selected_text.length > italic_syntax.length * 2 &&
// If the selected text contains italic syntax // If the selected text contains italic syntax
selected_text.slice(0, italic_syntax.length) === italic_syntax && selected_text.startsWith(italic_syntax) &&
selected_text.slice(-italic_syntax.length) === italic_syntax selected_text.endsWith(italic_syntax)
) { ) {
if (is_inner_text_formatted(bold_syntax)) { if (is_inner_text_formatted(bold_syntax)) {
if ( if (
selected_text.length > bold_and_italic_syntax.length * 2 && selected_text.length > bold_and_italic_syntax.length * 2 &&
selected_text.slice(0, bold_and_italic_syntax.length) === selected_text.startsWith(bold_and_italic_syntax) &&
bold_and_italic_syntax && selected_text.endsWith(bold_and_italic_syntax)
selected_text.slice(-bold_and_italic_syntax.length) ===
bold_and_italic_syntax
) { ) {
// If selected text is both bold and italic. // If selected text is both bold and italic.
is_inner_text_italic = true; is_inner_text_italic = true;