From 856329bb45fe2f0678c616b03a31d41706a74e3b Mon Sep 17 00:00:00 2001 From: Satyam Bansal Date: Thu, 25 May 2023 01:24:14 +0530 Subject: [PATCH] message_formatting: Reorder items to prioritize more useful ones. Fixes #25743. --- web/src/info_overlay.js | 140 ++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/web/src/info_overlay.js b/web/src/info_overlay.js index fa8d7fa0f5..effb002ef0 100644 --- a/web/src/info_overlay.js +++ b/web/src/info_overlay.js @@ -21,38 +21,28 @@ import * as util from "./util"; export let toggler; const markdown_help_rows = [ - { - markdown: "*italic*", - usage_html: "(or Ctrl+I)", - }, { markdown: "**bold**", usage_html: "(or Ctrl+B)", }, + { + markdown: "*italic*", + usage_html: "(or Ctrl+I)", + }, { markdown: "~~strikethrough~~", }, + { + markdown: ":heart:", + }, { markdown: "[Zulip website](https://zulip.org)", usage_html: "(or Ctrl+Shift+L)", }, { - markdown: `\ -* Milk -* Tea - * Green tea - * Black tea - * Oolong tea -* Coffee`, - }, - { - markdown: `\ -1. Milk -1. Tea -1. Coffee`, - }, - { - markdown: ":heart:", + markdown: "#**streamName**", + output_html: "

#streamName

", + effect_html: "(links to a stream)", }, { markdown: "@**Joe Smith**", @@ -71,45 +61,34 @@ const markdown_help_rows = [ effect_html: "(notifies all recipients)", }, { - markdown: "#**streamName**", - output_html: "

#streamName

", - effect_html: "(links to a stream)", + markdown: `\ +* Milk +* Tea + * Green tea + * Black tea + * Oolong tea +* Coffee`, }, { - markdown: "/me is busy working", - output_html: '

Iago is busy working

', + markdown: `\ +1. Milk +1. Tea +1. Coffee`, }, { - markdown: `/poll What did you drink this morning? -Milk -Tea -Coffee`, - output_html: `\ -
-

What did you drink this morning?

- - -
-`, + markdown: "> Quoted", + }, + { + markdown: `\ +\`\`\`quote +Quoted block +\`\`\``, + }, + { + markdown: `\ +\`\`\`spoiler Always visible heading +This text won't be visible until the user clicks. +\`\`\``, }, { markdown: "Some inline `code`", @@ -145,21 +124,6 @@ def zulip(): }, ), }, - { - markdown: "> Quoted", - }, - { - markdown: `\ -\`\`\`quote -Quoted block -\`\`\``, - }, - { - markdown: `\ -\`\`\`spoiler Always visible heading -This text won't be visible until the user clicks. -\`\`\``, - }, { markdown: "Some inline math $$ e^{i \\pi} + 1 = 0 $$", }, @@ -168,6 +132,42 @@ This text won't be visible until the user clicks. \`\`\`math \\int_{0}^{1} f(x) dx \`\`\``, + }, + { + markdown: "/me is busy working", + output_html: '

Iago is busy working

', + }, + { + markdown: `/poll What did you drink this morning? +Milk +Tea +Coffee`, + output_html: `\ +
+

What did you drink this morning?

+ + +
+`, }, { markdown: "---",