Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
compose: Extract apply_preview_render from show_preview.
Aadyot1fa4ba553a800
diff --git a/web/src/compose_ui.ts b/web/src/compose_ui.tsindex 850646ed4cb..aa522c26c45 100644--- a/web/src/compose_ui.ts+++ b/web/src/compose_ui.ts@@ -1712,6 +1712,45 @@ export function exit_preview_mode($container: JQuery): void {$container.find(".markdown_preview").show();}+function apply_preview_render(+ $preview_container: JQuery,+ $preview_spinner: JQuery,+ $preview_content_box: JQuery,+ content: string,+ rendered_content: string,+ raw_content?: string,+): void {+ // content is passed to check for status messages ("/me ...")+ // and will be undefined in case of errors+ let rendered_preview_html;+ if (raw_content !== undefined && markdown.is_status_message(raw_content)) {+ // Handle previews of /me messages+ rendered_preview_html =+ "<p><strong>" ++ _.escape(current_user.full_name) ++ "</strong>" ++ rendered_content.slice("<p>/me".length);+ } else {+ rendered_preview_html = rendered_content;+ }++ $preview_content_box.html(postprocess_content(rendered_preview_html));+ rendered_markdown.update_elements($preview_content_box);++ // Check for thumbnail loading placeholders and start polling+ clear_thumbnail_polling();+ pending_thumbnail_paths = extract_thumbnail_paths($preview_content_box);++ if (pending_thumbnail_paths.size > 0) {+ void poll_thumbnail_status(+ $preview_container,+ $preview_spinner,+ $preview_content_box,+ content,+ );+ }+}+export function render_and_show_preview($preview_container: JQuery,$preview_spinner: JQuery,@@ -1726,40 +1765,14 @@ export function render_and_show_preview(const preview_render_count = compose_state.get_preview_render_count() + 1;compose_state.set_preview_render_count(preview_render_count);- function show_preview(rendered_content: string, raw_content?: string): void {- // content is passed to check for status messages ("/me ...")- // and will be undefined in case of errors- let rendered_preview_html;- if (raw_content !== undefined && markdown.is_status_message(raw_content)) {- // Handle previews of /me messages- rendered_preview_html =- "<p><strong>" +- _.escape(current_user.full_name) +- "</strong>" +- rendered_content.slice("<p>/me".length);- } else {- rendered_preview_html = rendered_content;- }-- $preview_content_box.html(postprocess_content(rendered_preview_html));- rendered_markdown.update_elements($preview_content_box);-- // Check for thumbnail loading placeholders and start polling- clear_thumbnail_polling();- pending_thumbnail_paths = extract_thumbnail_paths($preview_content_box);-- if (pending_thumbnail_paths.size > 0) {- void poll_thumbnail_status(- $preview_container,- $preview_spinner,- $preview_content_box,- content,- );- }- }-if (content.length === 0) {- show_preview($t_html({defaultMessage: "Nothing to preview"}));+ apply_preview_render(+ $preview_container,+ $preview_spinner,+ $preview_content_box,+ content,+ $t_html({defaultMessage: "Nothing to preview"}),+ );} else {if (markdown.contains_backend_only_syntax(content) && show_spinner) {const $spinner = $preview_spinner.expectOne();@@ -1774,7 +1787,13 @@ export function render_and_show_preview(// echoed frontend rendering before receiving the// authoritative backend rendering from the server).const rendered_content = markdown.render(content).content;- show_preview(rendered_content);+ apply_preview_render(+ $preview_container,+ $preview_spinner,+ $preview_content_box,+ content,+ rendered_content,+ );}void channel.post({url: "/json/messages/render",@@ -1794,13 +1813,26 @@ export function render_and_show_preview(if (markdown.contains_backend_only_syntax(content)) {loading.destroy_indicator($preview_spinner);}- show_preview(data.rendered, content);+ apply_preview_render(+ $preview_container,+ $preview_spinner,+ $preview_content_box,+ content,+ data.rendered,+ content,+ );},error() {if (markdown.contains_backend_only_syntax(content)) {loading.destroy_indicator($preview_spinner);}- show_preview($t_html({defaultMessage: "Failed to generate preview"}));+ apply_preview_render(+ $preview_container,+ $preview_spinner,+ $preview_content_box,+ content,+ $t_html({defaultMessage: "Failed to generate preview"}),+ );},});}