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

Use backend markdown processor in message preview.

Browse Source 
[tweaked by tabbott to add comment and fetch the authoritative
rendering from the backend unconditionally]

Fixes #1834.
This commit is contained in:
hackerkid
2016-09-24 15:46:42 +05:30
committed by Tim Abbott
parent 4959e8d10a
commit dc355fcf1e
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
static/js/compose.js
View File

@@ -1004,7 +1004,6 @@ $(function () {
$("#compose").on("click", "#markdown_preview", function (e) {
e.preventDefault();
var message = $("#new_message_content").val();
var preview = echo.apply_markdown(message);
$("#new_message_content").hide();
$("#markdown_preview").hide();
$("#undo_markdown_preview").show();
@@ -1013,7 +1012,29 @@ $(function () {
if (message.length === 0) {
$("#preview_message_area").html(i18n.t("Nothing to preview"));
} else {
$("#preview_message_area").html(preview);
if (echo.contains_bugdown(message)) {
$("#preview_message_area").html(i18n.t("Loading preview..."));
} else {
// For messages that don't appear to contain
// bugdown-specific syntax not present in our
// marked.js frontend processor, we render using the
// frontend markdown processor message (but still
// render server-side to ensure the preview is
// accurate; if the `echo.contains_bugdown` logic is
// incorrect wrong, users will see a brief flicker).
$("#preview_message_area").html(echo.apply_markdown(message));
}
channel.get({
url: '/json/messages/render',
idempotent: true,
data: {content: message},
success: function (response_data) {
$("#preview_message_area").html(response_data.rendered);
},
error: function () {
$("#preview_message_area").html(i18n.t("Failed to generate preview"));
}
});
}
});